Feature/issue 131 all questions complete