Some work on the evaluator