Handle drafts better
First draft