Editor's drafts for jaime-additions branch of CxRes/events-query