ENG-6197: Checkpoint. About 80% done with commenting and tweaking for simplicity.