WIP - checkpoint
Hooray - working - still a test failure, but it's a test bug.