move to cpp-calc