Great thankyou, i think i will now start from all new.

Also i noticed on the north and south of the switch from the factory there is a terminal that is wired to ground , do i replicate this on the new switch?
(purple arrow in pic)

Thankyou
Mark