Editor's drafts for add_charter_def branch of rahelFain/combined-diem-uses-reqs