Initial implementation of the complete query parser