massive reconfiguration time again.

My favorite place to work on wiring harness is on my couch, it's easy, I suggest getting a diagram with color codes.