I'll add it to the backlog unless you think it needs to be in this pull, should be self contained enough that we can do it across all of the roles for all templates.