Cleaning up the controllers code.  Making way for a game-viewer
controller.