Added question-id, moved out controller, fixed up automatic id's
Fixed up the selecting on question type
Added the base details for propagation