Calc part 2 - interim commit