Added Templates , need edits