A little more MVC architechture