Attempting to fix merge issues
Merge branch 'JacobsBranch' of https://github.com/tashage/sonshine into JacobsBranch