OK, so when I wire it up like this, without these two cables which I think are the secondary hallway switch - everything works.
Except the second switch in the hall of course.
Really not sure where to put these though...
http://www.diynot.com/network/ukmattj/albums/14883/55233
With...