move to true MVC