initial commit of field query with tests