Sorry couldn't post this sooner. Thanks again for the help.
I've got some pictures of the box before I moved anything... other than pulling the switches out so I could take 'em apart. Glad I took the pics.
In case it isn't clear: the switch on the left is #1. It had the red and white wires attached from the feed.
Switch #2 is on the right. It had the black wire directly from the feed and a short black between it and switch #1. That's it.