start adding support for choices