Thank you both!
I went ahead and did the switches. It only took a few minutes and I didn't want to put it off, so here's one last picture. Sorry for the blur...my phone camera is not so great.
Crap! Still gotta do the cigarette lighter socket! Oh, well...one more to go.
Side note; my brain is fried!