No, not left the building, but sitting here feeling quite stupid. Originally I posted this on the 'General DiY' forum and hadn't realised it had been moved here. Just found it.
Yep, I got it wrong. It was all wired up correctly. My terminology for the wiring was as stated 'completely wrong'...