major refactoring to simplify Evaluator creation