Rebuild code construct, use mvc