First iteration to combining model-view-controller