Switch to Moo, add infrastructure, fix a couple of bugs.