Further cleaned up drafting, now can swipe multiple