half working
+some to MVC