I'm bad and didn't check things in incrementally so we'll just call this commit 'progress'.