will try to answer the above^ after reviewing the PR further this afternoon, and will ask john to check my work