Started MVC refactor

Still very rough, will clean up later