MVC Update 01

Update on implementing MVC.

Not yet fully functional.