work on generizing templates that forgot to commit and push last week