Moved evaluator stuff into seperate class.