Add polish evaluator - in progress