Draft: (To be split out) Template clean up sketch

Description

Sketch of how we could do incremental refactoring to solve #60 (closed).

Checklist

Please confirm that this pull request has done the following:

- [ ] Tests added

• Documentation added (where applicable)
• Changelog item added to changelog/