Checkpoint commit. Gotta run.

Added a few TODO/BUG comments so I don't forget.