Working copy of templates, should be done now