Quick swap

I decided to change the order - let WA handle the input, and then let
our calculator struggle through it. Still have problems displaying
constants though.