Adding functionality to Calculator