Okay, we're back to mostly working but with MVC now!