A little tech tip if you don’t already know. When installing the new harness. Instead of using the vehicle battery when testing the circuits, use a small battery charger, a 10/2 is great. They have built in circuit breakers. If something is askew it trips the breaker instead of melting wires and well you know where it goes from there.
