Add in extremely rudimentary handling of choice