Added some of the functionalities of the calculator