More work on the calculator.