adding templates

Conflicts not removed here and in the entire PR