Refactored the evaluator....