Preliminary work on saving drafts