Made changes to the calculator. Needs recursion.