Refactor question into a class
Merge branch 'question'