Add evaluator and modify cards to work with evaluator