Added Calc methods

Main has some test code. solveExpression is working when tested.