Jan Hellar Are you working directly with master or on the separate branch. I will be cool to get things into couple chunks as it will be hard to review. For example commit and merge base template first as single PR. Then tackle the rest. WDYT?