Controller Update

Changed a bit of the code so that the controller functions as I believe
it's meant to.