lots of changes, but something ain't right about the time logging for templates