move some stuff around to organize more so we can clearly see the controller classes