Major MVC refactoring
Massive MVC update