Michaels refactoring to better structure controller and manager api