Controller refactor

Sexier and more angular.