Correctly template everything out