Working on new Template system