Adding in some of the MVC code...