Started working on templates on both apps