In the GLES project, GESIS will prepare and run several surveys on the German national election in 2017. In EDDI2015 we provided an overview of the workflow necessary. The mostly manual process of creating questionnaires to running the study and documenting it for research and evaluation will be supported by several web-based tools. One major tool developed within the project is the questionnaire editor. On the frontend it is a collaborative editor to create, edit and structure questionnaires. It enables to create questions, question grids and logical blocks as main components. Answer domains, interviewer instructions and filter statements are managed separately for reuse. On the backend side it is fully DDI-L enabled based on the DDI-FlatDB architecture with full history on revisions and versions. To support the creation process a question database will be developed to find questions from other studies or older waves. The information that the questions are re-used will be stored in the new questionnaire for methodological research. At any time, the questionnaire can be exported to DDI, PDF or office formats. In addition, statistical file prototypes can be created for handover to the survey institutions to predefine the structure and naming conventions of the later dataset.