I've been working on this for a while now.

I'm about to make the change over to a new template.

I'll let you know when it's done.  Hopefully I don't stuff anything up!