Sure, I'll revert and bring up template changes in a separate issue.