Correct, it is closer to 45, especially for the return trip. It's not the number of stops, it's changing trains outside of rush hour.
The return trip will be to Vienna. Don't really care about that. I was hoping there was some sort of water taxi that cost 10 bucks to go from the DCA area to the ball park or near the Mall or something.
