Moved majority of ctrl logic into service
Slimmed down the controller a bit more - moved more to service