Added templates, NEED to redo the accordion