Finished controller work
Merge branch 'Controller-work'