Calc classes

I am down to remove this but I think rkonell is still using them for some of his testing?