My harnesses appear to be in good shape, Will - so, I plan to keep the original wires. But, I’ll be replacing the housings with these 3D printed parts from Vincent Van Humbeeck. I note further in that thread that I got 'em. Hopefully it will all come together!