added MVC stuff