Working on controller
Controller getting fat, starting to rethink it