Checkpoint, about to simplify to single orbit