Added basic MVC Functionality
Clean up Code