Switch to PSEUDO MVC model. Gorp integration to come