temporary commit, everything broken.  still need to turn choices into list