Another template update for #209. This is too much work to do manually. Going to write a script