Stopped refactoring the controller.

The whole architecture needs some work.