Good idea.  I will close this pull request and open one for the templates.