Changes from last night

Forgot to push this to github. Pulled origin before pushing, so hoping that no issues arise.