lunch work. Mainly tidy up the evaluator