Close #6: ChoiceFields choices now are list of tuples (choice_value, choice_text)