Start work on controllers
Finish up controller simplification
Clean up