Move decorators out of drafts
Update draft of decorators.

'tis a bit too silly, but that is what revising is for!