Should also clarify, that the cabling is the original, red, black and earth
I am using newer cabling for the extension pieces, ie. brown, blue and earth.
I tried to put it all as the same in the original post to save any confusion, but ended up doing so anyway !
Cheers, Lee