Added unfinished query skeleton