This is pretty tedious stuff and the wires are so small that they are hard to work with, but perseverance paid off and I got it done. Tomorrow I'll finish wiring the plug for the stick grips.
Installed 2 x 9 pin connectors onto each of the trim indicators
