Checkpoint, tests passing.