Added calculator functionality