Close #16: drafts