What's this PR do? Where should the reviewer start? How should this be manually tested? Checklist I have written specs/coverage where required. I have tested this myself before review. I have cleaned up redundant template boilerplate from this PR description.