Began implementing new Router and Controller class