Initial commit of the draft Conventions update to the Drafts branch