added a basic query builder