rebasing now, because perhaps that is sufficiently resolved at this point.