58428556 | refactoring how templates are handled