MVC is working normally, need to move Router vars to model, need to clean up code