Well done Timbo, that looks very professional. I didn't bypass the wires to the plug, but everything works as it should, except the kill switch. If the bike was mine I wouldn't care as I never use the kill switches on my bikes, but as it isn't mine, I might have to rethink it before I hand it over to Mike.
I'll take you up on the hub too mate, thanks for that, and I want any other K0 parts you might come across. Cheers, Terry.