Old stuff out, pretty sure its all CCA so took a weight hit but such is life
These are the problem areas I was worried about
But did manage to get a nice terminal block to get all the hot leads off the shut off switch
Few less things to potentially go wrong. I hope.