Checkpoint

Checkpoint commit before merging GitHub branches, in case something goes
wrong. Should have no real changes from last commit, except a lot of
println statements, but creating a checkpoint just to be sure.