Refactor to USE MVC