more work on the controller

should be all good