First decent commit. Lots of scaffolding.