Editor's drafts for jri/addself branch of martinthomson/train-protocol