Enough dicking around with broken bits from my CMS upgrade – time to get some real work done.