progress on evaluator
evalutor tests are passing