Friday work

Lots to do
Merge branch 'master' of https://github.com/astrofoley/astr596