Starting to implement query visitors