Added fields and logic to questions
Compile for build