Starting on query stuff
fixed merged conflicts