MVC implementation stage 1

Implemented some of the stuff for our MVC pattern