Refactored & PIMPED THE SHIZNIT out of the templating system