All cleaned up and ready for re-assembly
Initial wiring for the switch - this got cleaned up.
Here I have most of it cleaned out.