First stab at converting some stuff to Moo.