Small update on this, including standards and a few template fillers.