More switches

Only had 30 mins or so free today, but I did manage to get the rest of the switches in how I want them.