Added ability to parse query string
LEFT OFF: working on new parser logic.