working on templates
merging?