Updated for Beta 1.1, removed the scene-switching, cleaned up.