Modified project code to fully implement model-view implementation