Checkpoint commit

Things are not working yet, but they are better than before.