Made major changes to Calculators
More changes to calculator