What the world needs is more templates.
Removed and rewrote the old crufty code.