CalcHandler done. To tests #12