New templates for comparison.
Use call-template, apply-templates
Refactor