Added Calculations entity. Not complete and not tested