first checkin for query builder stuff