Lots of changes.

Including:
 - Question --> Prompt
 - Answer   --> Choice