Updated manager to be more functional, controllers changed to work with the new system, refactored several files so indents are correct.