Adds Controller class and starts working on working skeleton.
Merge changes from team members
Post merge commit