New repositories handle a lot of the stuff now

* Just a few tiny changes to the controller
* Repository is now very small
* No code is as good as no code