finally two working templates
stuff
merge