More work on calculator, shunting algorithm