Added attributes for new Controllers, started major UML restructuring to make it more MVCish