Now that that refactor is out of the way, I can focus on the main changes for the Drafts action.