Add beginnings of query parsing.