Started working on templates