Almost completed MVC functionality