Yep, EDF moved the cut-out and the meter board for me - really nice, helpful guys. Wouldn't really want to mess with that myself! Spark fixed a new 17th CU (with RCDs) and connected up a temp ring and lights until I get the new cicuits to first fix, then he'll connect up and test.
I know...