Revert "Revert "MVC""

This reverts commit 2140352ec049eb506cfe8203c1b2c41b27382738.