Exposing the timer to the controller
Renaming controller, moving things around