Renamed Evaluator -> EvaluatingVisitor
Working on property collector