Continue controllers

--did some cleaning up of the controllers
--will require much more communication with other groups