Current progress on bringing query code in