need to finish queries