First rough version of "add a questionnaire"