Move more reponsiblity into the controller
These weren't committed?