guess evaluator tests are passing, and did a lil refactoring