Complete making controls.  Need tests for it.