Checkpoint, about to fix things up a bit