Split out the controllers. Working much better.
Have an init function on the controller. Now we have something to test.