Yep, got it all sorted now, thanks all. Didn't take me long to realise my error! Doh! All now working as it should. I think where I went wrong is - the wiring layout was simple, I went and made it complicated!
PS. RFLighting, no I haven't added the additional lighting and wiring yet.