Changes to Calculator and MyStack