Cleaning up controllers.  Much nicer now.
Cleaning up controllers even more.  Think I'm happy now.
Cleaning up controllers even more.  Think I'm happy now.