Working on the evaluator