4 choices: YNAV variant

This PR has the **YNAV** variant of my four-choices patch.  See #8 for details, and for the other variant.