Work on adding questions