Refactored free draw selection for DAWNSCI-891