Making progress on the evaluator.