Major refactor on evaluation.