this will conflict with my rendering contact rewrite in bug 934531. I hope to have a first patch tomorrow but the general architecture is finished imo. If you want I can already squash it so that you can base your work on it?

What is already better for you is that it's easy to switch templates with my rewrite. And what's good for me is that we'll see whether this rewrite is good, if we see that it fits your needs :)