Committing with some more changes to Calculator. Need help on .h