Finished up work and testing on controllers.