Success on the wiring part - just checked and its all good. I still have to reassemble it, including bending the stalk.

More tea I suspect.....