Flesh out MVC classes