Added Calcs class