Hahaaa. Had some wiring issues. So I decided to start from scratch and get rid of a bunch of useless crap. Here is what I accomplished during lunch.
The good news is that I took out a dozen or so wires and a couple of switches, and I still have a good circuit.
