Choice options now use enums
Accounted for new team allocation system