Calc Part 2 - interim commit - functionality working