First commit to integrate MVC components
Fixing up ignores