Thank you, this solution worked great!
I didn't dive into the Regexp solutions because I suspected there was a simple way to switch those tokens around just like this solution does. I just couldn't find an example anywhere.
Thanks again for everyone's help.