Initial exploratory work on checkpoints feature