Re: Options/Choices refactor