MVC/XHP overhaul.