Made slight changes in MainController, should stop using this branch
soon.