Working on the templates