Scene Switches & Code Cleanup

First attempt to combine scene switch code (Erik) and current cannon
play scene (Cameron)