starting to fix templates