Questionaire

Not fully working code, needs to be changed according to the new class
structure