consolidated the controllers.  I still have a few more things to consolidate.