New "TemplateSystem" - first working version