Template re-work and test