Standard Query Parser

Work in progress