Added Calculator class to perform the actual calculations