Hi triplewhammy, sounds like you been very busy, BUT, as for cross bonding the water pipes this is no longer a diy, job, in fact it is illegal to do it yourself unless you have notified the local council, legally you need to call out a sparky that is registered for part P of the building regs, i know it sounds stupid, but that is how it is, if you do carry out the work yourself and something does go wrong, you will be liable so think carefully, the penalties are now quite harsh, sorry for bringing the bad news to you,Ray