Finished breaking up DraftController logic into smaller pieces