Added MVC for future testing