finished working on templates