Reworked templating so it makes more sense. I think.