Continued work on Controller.