Started working on add and templates