Checkpoint, about to fix somethings up