Adding main controller. from now on, will work in branches until ready to commit