Added a second switch.
Got a lot of the switches up.