Moved a bunch of the JS into a controller
More progress with new views