Cleaning up events, preparing for sub programs
Merge branch 'Aaron' into Develop