Continued refactoring in ParsEval, needs more work