getting closer to the right handling of choices