finished some details
new query classes