Refactored the calculator functionality to the BasicCalculator. 1.1 & 1.2