Refactored templates to make them much nicer to compose