Work in progress
Added context object to callbacks
Query parsing the query string
Work in progress