Added framework for accepting multiple choices. Not wired up yet.