Added evaluator with basic primitive handling