I finally went to bed about 2am today but I got all the wiring done and it all works... now. A couple of wires in the wrong place but nothing some head scratching and a bit of re soldering couldn't put right.
The track is all cleaned up of plaster and works well enough, I started painting but couldn't keep my eyes open any longer so stopped.
One casualty of late night working was the smallest hut which got hoovered up, I've rescued the parts but its all a bit bent.
I've had my toast and coffee so I'm back off to the shed to make some more progress. Looks promising for Saturday.