Added a choice mixin to make writing the choice objects a bit easier-still need to do a little more howeer.