Tests passing and basic templating, wait did I fix the unique thing