Checkpoint

Missed a few commits, catching up.