working on the new Template system