Moved more material in from the base change file; I'll work it into the draft.