With the test rig now finally working and doing what it is supposed to be doing I decided to return to the re-wiring yet again of the Mattington layout. Baseboard 1 originally built in 2004, I think this is the fourth attempt I have had at re-wiring it but this time I hope it will be the last. Am installing a CBUS layout control bus alongside the DCC bus but I am re-wiring both of them and adding several more drop downs for the DCC bus as well as wiring in the polarity switches directly into the dcc bus rather than to the track. 

I have done about 2 thirds of the wiring now. The plan is to have three CANSOLS, one CANACC8 and a CANAC8C temporally controlling both the point motors and the building lights, (and a CANUSB and CANGIZMO) Temporally until I can get a CANPAN built (1 event will be controlling all lights in the meantime and other events will be controlling 2 to 4 turnouts). I have kept the original wiring of the point motors and the drop downs so some of it isn't exactly how I would like it if I was doing it all from scratch but I don't want to completely start all over again.

Just got to do the data bus wiring for the L and H wires but that shouldn't be too difficult since its only got to go between 8 modules. Am doing it last because I want there to be a separation between the data bus and the power bus. 

Photo of where I am currently at. All the wiring on the floor is what I have stripped out as being surplus, am working right to left along the board. Red and yellow is dcc, blue are point motors, purple and green is 0 and 12v cbus power supply

Layout is being installed ontop of kitchen units the biggest ones I could get through the loft hatch.