Removed a lot of code and made it easier and much less error prone to set up the scene.