Almost done with ValueCalculator