Add some MVC and More Functionality