Completes first draft of query parser
Ditches initial draft of query parser