Safe checkpoint, about to fix stuff