Added Calculations class