Checkpointing work-in-progress.  Still not ready.