Checkpoint; working fairly well, about to cleanup