Hi Dan, yes to the first diagram.
The second diagram, thankyou, I hadn't seen that diagram, it was looped back onto itself with a bridging piece, no male and female connectors and hanging down over the right side of the axle, I figure it is a basic on/off switch for whatever it is attached to...