Working copy of templating, all but editing works and is tested
automatic merge