Template Rejig

Let's see if we can get the milestone complete for this pull request.