Breaking up the controller