Added some question stuff. This might break things.
Merge pull request #25 from brain-murphy/brian

Added some question stuff. This might break things.