Thanks guys - will check out switch, spring & connector block Today.
I'm all metered up so I'll have a look see.