Added query thingy
Merged changes