Add text for "words-only-one-choice-for-this-question"
Add special handling for question with just one choice
Update to match changes in generic version
Begin to update to use refactored generic version