General cleanup, get material picking working. Get drafts references working. Get
ready for submitting and/or saving a draft.