Calc classes

We should remove these functions before merging.