Added query skeleton + query 5 complete