Added the camera to the scene, and switched around some logic to other classes