User picks are now part of the option entity. Closes #18.
merging changes.