Soldering is not good . should use crimp ferrels.
Sorry Ed but don't agree with this one in general, however the lead free stuff is rubbish (which is perhaps why the 60/40 tin/lead is still used for military equipment in the UK) and crimps would be better if you can't use 60/40.
Nice diagram Barry (I have pasted a small copy of my diagram on the inside of my control box door for reference).
Tweakie.