initial add of query.go