Basic MVC logic added