Move MVC impl to Main, disable closure for now, add debugging