More work on the calculator portion