diff --git a/proto/pilosa.pb.go b/proto/pilosa.pb.go
index 2cec94582..e7adb4609 100644
--- a/proto/pilosa.pb.go
+++ b/proto/pilosa.pb.go
@@ -4,14 +4,13 @@
 package pilosa
 
 import (
+	context "context"
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
-)
-
-import (
-	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -23,7 +22,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type QueryPQLRequest struct {
 	Index                string   `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"`
@@ -174,6 +173,100 @@ func (m *RowResponse) GetStatusError() *StatusError {
 	return nil
 }
 
+type Row struct {
+	Columns              []*ColumnResponse `protobuf:"bytes,1,rep,name=columns,proto3" json:"columns,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *Row) Reset()         { *m = Row{} }
+func (m *Row) String() string { return proto.CompactTextString(m) }
+func (*Row) ProtoMessage()    {}
+func (*Row) Descriptor() ([]byte, []int) {
+	return fileDescriptor_ef0691a44d1e275c, []int{3}
+}
+
+func (m *Row) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Row.Unmarshal(m, b)
+}
+func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Row.Marshal(b, m, deterministic)
+}
+func (m *Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Row.Merge(m, src)
+}
+func (m *Row) XXX_Size() int {
+	return xxx_messageInfo_Row.Size(m)
+}
+func (m *Row) XXX_DiscardUnknown() {
+	xxx_messageInfo_Row.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Row proto.InternalMessageInfo
+
+func (m *Row) GetColumns() []*ColumnResponse {
+	if m != nil {
+		return m.Columns
+	}
+	return nil
+}
+
+type TableResponse struct {
+	Headers              []*ColumnInfo `protobuf:"bytes,1,rep,name=headers,proto3" json:"headers,omitempty"`
+	Rows                 []*Row        `protobuf:"bytes,2,rep,name=rows,proto3" json:"rows,omitempty"`
+	StatusError          *StatusError  `protobuf:"bytes,3,opt,name=StatusError,proto3" json:"StatusError,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *TableResponse) Reset()         { *m = TableResponse{} }
+func (m *TableResponse) String() string { return proto.CompactTextString(m) }
+func (*TableResponse) ProtoMessage()    {}
+func (*TableResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_ef0691a44d1e275c, []int{4}
+}
+
+func (m *TableResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TableResponse.Unmarshal(m, b)
+}
+func (m *TableResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TableResponse.Marshal(b, m, deterministic)
+}
+func (m *TableResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TableResponse.Merge(m, src)
+}
+func (m *TableResponse) XXX_Size() int {
+	return xxx_messageInfo_TableResponse.Size(m)
+}
+func (m *TableResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_TableResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TableResponse proto.InternalMessageInfo
+
+func (m *TableResponse) GetHeaders() []*ColumnInfo {
+	if m != nil {
+		return m.Headers
+	}
+	return nil
+}
+
+func (m *TableResponse) GetRows() []*Row {
+	if m != nil {
+		return m.Rows
+	}
+	return nil
+}
+
+func (m *TableResponse) GetStatusError() *StatusError {
+	if m != nil {
+		return m.StatusError
+	}
+	return nil
+}
+
 type ColumnInfo struct {
 	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Datatype             string   `protobuf:"bytes,2,opt,name=datatype,proto3" json:"datatype,omitempty"`
@@ -186,7 +279,7 @@ func (m *ColumnInfo) Reset()         { *m = ColumnInfo{} }
 func (m *ColumnInfo) String() string { return proto.CompactTextString(m) }
 func (*ColumnInfo) ProtoMessage()    {}
 func (*ColumnInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ef0691a44d1e275c, []int{3}
+	return fileDescriptor_ef0691a44d1e275c, []int{5}
 }
 
 func (m *ColumnInfo) XXX_Unmarshal(b []byte) error {
@@ -241,7 +334,7 @@ func (m *ColumnResponse) Reset()         { *m = ColumnResponse{} }
 func (m *ColumnResponse) String() string { return proto.CompactTextString(m) }
 func (*ColumnResponse) ProtoMessage()    {}
 func (*ColumnResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ef0691a44d1e275c, []int{4}
+	return fileDescriptor_ef0691a44d1e275c, []int{6}
 }
 
 func (m *ColumnResponse) XXX_Unmarshal(b []byte) error {
@@ -377,9 +470,9 @@ func (m *ColumnResponse) GetFloat64Val() float64 {
 	return 0
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ColumnResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ColumnResponse_OneofMarshaler, _ColumnResponse_OneofUnmarshaler, _ColumnResponse_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*ColumnResponse) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*ColumnResponse_StringVal)(nil),
 		(*ColumnResponse_Uint64Val)(nil),
 		(*ColumnResponse_Int64Val)(nil),
@@ -391,156 +484,6 @@ func (*ColumnResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer
 	}
 }
 
-func _ColumnResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ColumnResponse)
-	// columnVal
-	switch x := m.ColumnVal.(type) {
-	case *ColumnResponse_StringVal:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringVal)
-	case *ColumnResponse_Uint64Val:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Uint64Val))
-	case *ColumnResponse_Int64Val:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Int64Val))
-	case *ColumnResponse_BoolVal:
-		t := uint64(0)
-		if x.BoolVal {
-			t = 1
-		}
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *ColumnResponse_BlobVal:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.BlobVal)
-	case *ColumnResponse_Uint64ArrayVal:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Uint64ArrayVal); err != nil {
-			return err
-		}
-	case *ColumnResponse_StringArrayVal:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StringArrayVal); err != nil {
-			return err
-		}
-	case *ColumnResponse_Float64Val:
-		b.EncodeVarint(8<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.Float64Val))
-	case nil:
-	default:
-		return fmt.Errorf("ColumnResponse.ColumnVal has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ColumnResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ColumnResponse)
-	switch tag {
-	case 1: // columnVal.stringVal
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.ColumnVal = &ColumnResponse_StringVal{x}
-		return true, err
-	case 2: // columnVal.uint64Val
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ColumnVal = &ColumnResponse_Uint64Val{x}
-		return true, err
-	case 3: // columnVal.int64Val
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ColumnVal = &ColumnResponse_Int64Val{int64(x)}
-		return true, err
-	case 4: // columnVal.boolVal
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.ColumnVal = &ColumnResponse_BoolVal{x != 0}
-		return true, err
-	case 5: // columnVal.blobVal
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.ColumnVal = &ColumnResponse_BlobVal{x}
-		return true, err
-	case 6: // columnVal.uint64ArrayVal
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Uint64Array)
-		err := b.DecodeMessage(msg)
-		m.ColumnVal = &ColumnResponse_Uint64ArrayVal{msg}
-		return true, err
-	case 7: // columnVal.stringArrayVal
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StringArray)
-		err := b.DecodeMessage(msg)
-		m.ColumnVal = &ColumnResponse_StringArrayVal{msg}
-		return true, err
-	case 8: // columnVal.float64Val
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.ColumnVal = &ColumnResponse_Float64Val{math.Float64frombits(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ColumnResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ColumnResponse)
-	// columnVal
-	switch x := m.ColumnVal.(type) {
-	case *ColumnResponse_StringVal:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.StringVal)))
-		n += len(x.StringVal)
-	case *ColumnResponse_Uint64Val:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Uint64Val))
-	case *ColumnResponse_Int64Val:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(x.Int64Val))
-	case *ColumnResponse_BoolVal:
-		n += 1 // tag and wire
-		n += 1
-	case *ColumnResponse_BlobVal:
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(len(x.BlobVal)))
-		n += len(x.BlobVal)
-	case *ColumnResponse_Uint64ArrayVal:
-		s := proto.Size(x.Uint64ArrayVal)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ColumnResponse_StringArrayVal:
-		s := proto.Size(x.StringArrayVal)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *ColumnResponse_Float64Val:
-		n += 1 // tag and wire
-		n += 8
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 type InspectRequest struct {
 	Index                string     `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"`
 	Columns              *IdsOrKeys `protobuf:"bytes,2,opt,name=columns,proto3" json:"columns,omitempty"`
@@ -556,7 +499,7 @@ func (m *InspectRequest) Reset()         { *m = InspectRequest{} }
 func (m *InspectRequest) String() string { return proto.CompactTextString(m) }
 func (*InspectRequest) ProtoMessage()    {}
 func (*InspectRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ef0691a44d1e275c, []int{5}
+	return fileDescriptor_ef0691a44d1e275c, []int{7}
 }
 
 func (m *InspectRequest) XXX_Unmarshal(b []byte) error {
@@ -623,7 +566,7 @@ func (m *Uint64Array) Reset()         { *m = Uint64Array{} }
 func (m *Uint64Array) String() string { return proto.CompactTextString(m) }
 func (*Uint64Array) ProtoMessage()    {}
 func (*Uint64Array) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ef0691a44d1e275c, []int{6}
+	return fileDescriptor_ef0691a44d1e275c, []int{8}
 }
 
 func (m *Uint64Array) XXX_Unmarshal(b []byte) error {
@@ -662,7 +605,7 @@ func (m *StringArray) Reset()         { *m = StringArray{} }
 func (m *StringArray) String() string { return proto.CompactTextString(m) }
 func (*StringArray) ProtoMessage()    {}
 func (*StringArray) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ef0691a44d1e275c, []int{7}
+	return fileDescriptor_ef0691a44d1e275c, []int{9}
 }
 
 func (m *StringArray) XXX_Unmarshal(b []byte) error {
@@ -704,7 +647,7 @@ func (m *IdsOrKeys) Reset()         { *m = IdsOrKeys{} }
 func (m *IdsOrKeys) String() string { return proto.CompactTextString(m) }
 func (*IdsOrKeys) ProtoMessage()    {}
 func (*IdsOrKeys) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ef0691a44d1e275c, []int{8}
+	return fileDescriptor_ef0691a44d1e275c, []int{10}
 }
 
 func (m *IdsOrKeys) XXX_Unmarshal(b []byte) error {
@@ -762,84 +705,20 @@ func (m *IdsOrKeys) GetKeys() *StringArray {
 	return nil
 }
 
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*IdsOrKeys) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _IdsOrKeys_OneofMarshaler, _IdsOrKeys_OneofUnmarshaler, _IdsOrKeys_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*IdsOrKeys) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
 		(*IdsOrKeys_Ids)(nil),
 		(*IdsOrKeys_Keys)(nil),
 	}
 }
 
-func _IdsOrKeys_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*IdsOrKeys)
-	// type
-	switch x := m.Type.(type) {
-	case *IdsOrKeys_Ids:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Ids); err != nil {
-			return err
-		}
-	case *IdsOrKeys_Keys:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Keys); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("IdsOrKeys.Type has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _IdsOrKeys_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*IdsOrKeys)
-	switch tag {
-	case 1: // type.ids
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Uint64Array)
-		err := b.DecodeMessage(msg)
-		m.Type = &IdsOrKeys_Ids{msg}
-		return true, err
-	case 2: // type.keys
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(StringArray)
-		err := b.DecodeMessage(msg)
-		m.Type = &IdsOrKeys_Keys{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _IdsOrKeys_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*IdsOrKeys)
-	// type
-	switch x := m.Type.(type) {
-	case *IdsOrKeys_Ids:
-		s := proto.Size(x.Ids)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *IdsOrKeys_Keys:
-		s := proto.Size(x.Keys)
-		n += 1 // tag and wire
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
 	proto.RegisterType((*QueryPQLRequest)(nil), "pilosa.QueryPQLRequest")
 	proto.RegisterType((*StatusError)(nil), "pilosa.StatusError")
 	proto.RegisterType((*RowResponse)(nil), "pilosa.RowResponse")
+	proto.RegisterType((*Row)(nil), "pilosa.Row")
+	proto.RegisterType((*TableResponse)(nil), "pilosa.TableResponse")
 	proto.RegisterType((*ColumnInfo)(nil), "pilosa.ColumnInfo")
 	proto.RegisterType((*ColumnResponse)(nil), "pilosa.ColumnResponse")
 	proto.RegisterType((*InspectRequest)(nil), "pilosa.InspectRequest")
@@ -848,6 +727,52 @@ func init() {
 	proto.RegisterType((*IdsOrKeys)(nil), "pilosa.IdsOrKeys")
 }
 
+func init() { proto.RegisterFile("pilosa.proto", fileDescriptor_ef0691a44d1e275c) }
+
+var fileDescriptor_ef0691a44d1e275c = []byte{
+	// 631 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6e, 0xd4, 0x3c,
+	0x10, 0x8d, 0x9b, 0x74, 0x7f, 0x26, 0x6d, 0xbf, 0x0f, 0x17, 0x4a, 0x54, 0x21, 0x08, 0xb9, 0x21,
+	0x08, 0x54, 0x55, 0xe5, 0x4f, 0x40, 0xb9, 0x68, 0x2b, 0xd0, 0x56, 0x80, 0x68, 0x0d, 0xed, 0xbd,
+	0xb7, 0xf1, 0x96, 0x08, 0x37, 0xde, 0xda, 0x5e, 0xca, 0x3e, 0x08, 0x6f, 0x00, 0x8f, 0xc2, 0x13,
+	0xf0, 0x42, 0xc8, 0x4e, 0x9c, 0x4d, 0x2a, 0x2d, 0x42, 0xbd, 0xf3, 0xcc, 0x39, 0xe3, 0x99, 0x33,
+	0x33, 0x36, 0x2c, 0x8d, 0x73, 0x2e, 0x14, 0xdd, 0x18, 0x4b, 0xa1, 0x05, 0xee, 0x94, 0x56, 0xf2,
+	0x1c, 0xfe, 0x3b, 0x9c, 0x30, 0x39, 0x3d, 0x38, 0x7c, 0x47, 0xd8, 0xf9, 0x84, 0x29, 0x8d, 0xaf,
+	0xc3, 0x62, 0x5e, 0x64, 0xec, 0x5b, 0x84, 0x62, 0x94, 0xf6, 0x49, 0x69, 0xe0, 0xff, 0xc1, 0x1f,
+	0x9f, 0xf3, 0x68, 0xc1, 0xfa, 0xcc, 0x31, 0x79, 0x09, 0xe1, 0x47, 0x4d, 0xf5, 0x44, 0xbd, 0x96,
+	0x52, 0x48, 0x8c, 0x21, 0xd8, 0x13, 0x19, 0xb3, 0x51, 0xcb, 0xc4, 0x9e, 0x71, 0x04, 0xdd, 0xf7,
+	0x4c, 0x29, 0x7a, 0xca, 0xaa, 0x40, 0x67, 0x26, 0x3f, 0x10, 0x84, 0x44, 0x5c, 0x10, 0xa6, 0xc6,
+	0xa2, 0x50, 0x0c, 0x3f, 0x84, 0xee, 0x67, 0x46, 0x33, 0x26, 0x55, 0x84, 0x62, 0x3f, 0x0d, 0xb7,
+	0xf0, 0x46, 0x55, 0xef, 0x9e, 0xe0, 0x93, 0xb3, 0x62, 0xbf, 0x18, 0x09, 0xe2, 0x28, 0x78, 0x13,
+	0xba, 0x27, 0xd6, 0xad, 0xa2, 0x05, 0xcb, 0x5e, 0x6b, 0xb3, 0xdd, 0xb5, 0xc4, 0xd1, 0xf0, 0x93,
+	0x56, 0xb1, 0x91, 0x1f, 0xa3, 0x34, 0xdc, 0x5a, 0x75, 0x51, 0x0d, 0x88, 0x34, 0x79, 0xc9, 0x33,
+	0xf0, 0x89, 0xb8, 0x68, 0xe6, 0x43, 0xff, 0x94, 0x2f, 0xf9, 0x8e, 0x60, 0xf9, 0x13, 0x1d, 0x72,
+	0x76, 0x45, 0x85, 0x77, 0x20, 0x90, 0xe2, 0xc2, 0xc9, 0x0b, 0x1d, 0xd5, 0xb4, 0xcc, 0x02, 0x57,
+	0x15, 0xb4, 0x0d, 0x30, 0x4b, 0x67, 0x66, 0x56, 0xd0, 0x33, 0x56, 0x4d, 0xda, 0x9e, 0xf1, 0x3a,
+	0xf4, 0x32, 0xaa, 0xa9, 0x9e, 0x8e, 0xdd, 0xd0, 0x6a, 0x3b, 0xf9, 0xbd, 0x00, 0x2b, 0x6d, 0xc5,
+	0xf8, 0x36, 0xf4, 0x95, 0x96, 0x79, 0x71, 0x7a, 0x4c, 0x79, 0x79, 0xcf, 0xc0, 0x23, 0x33, 0x97,
+	0xc1, 0x27, 0x79, 0xa1, 0x9f, 0x3e, 0x36, 0xb8, 0xb9, 0x2f, 0x30, 0x78, 0xed, 0xc2, 0xb7, 0xa0,
+	0x57, 0xc3, 0x46, 0x84, 0x3f, 0xf0, 0x48, 0xed, 0xc1, 0xeb, 0xd0, 0x1d, 0x0a, 0xc1, 0x0d, 0x18,
+	0xc4, 0x28, 0xed, 0x0d, 0x3c, 0xe2, 0x1c, 0x16, 0xe3, 0x62, 0x68, 0xb0, 0xc5, 0x18, 0xa5, 0x4b,
+	0x16, 0x2b, 0x1d, 0xf8, 0x15, 0xac, 0x94, 0x29, 0x76, 0xa4, 0xa4, 0x53, 0x43, 0xe9, 0xb4, 0x1b,
+	0x74, 0x34, 0x43, 0x07, 0x1e, 0xb9, 0x44, 0x36, 0xe1, 0xa5, 0x82, 0x3a, 0xbc, 0x7b, 0xb9, 0xbf,
+	0x35, 0x6a, 0xc2, 0xdb, 0x64, 0x1c, 0x03, 0x8c, 0xb8, 0xa0, 0x95, 0xaa, 0x5e, 0x8c, 0x52, 0x34,
+	0xf0, 0x48, 0xc3, 0xb7, 0x1b, 0x42, 0xbf, 0xdc, 0x94, 0x63, 0xca, 0x93, 0x9f, 0x08, 0x56, 0xf6,
+	0x0b, 0x35, 0x66, 0x27, 0xfa, 0xef, 0x6f, 0xf0, 0x41, 0x73, 0xed, 0x4d, 0x3d, 0xd7, 0x5c, 0x3d,
+	0xfb, 0x99, 0xfa, 0x20, 0xdf, 0xb2, 0xa9, 0x9a, 0x6d, 0x7c, 0x02, 0x4b, 0xa3, 0x9c, 0x6b, 0x26,
+	0xdf, 0xe4, 0x8c, 0x67, 0x2a, 0xf2, 0x63, 0x3f, 0xed, 0x93, 0x96, 0xcf, 0xa4, 0xe1, 0xf9, 0x59,
+	0xae, 0x6d, 0x73, 0x03, 0x52, 0x1a, 0x78, 0x0d, 0x3a, 0x62, 0x34, 0x52, 0x4c, 0xdb, 0xbe, 0x06,
+	0xa4, 0xb2, 0x92, 0xbb, 0x10, 0x36, 0xda, 0x66, 0x96, 0xe7, 0x2b, 0xe5, 0xe5, 0x36, 0x07, 0xc4,
+	0x9e, 0x0d, 0xa5, 0xd1, 0x9a, 0x16, 0xa5, 0x5f, 0x51, 0x4e, 0xa1, 0x5f, 0x57, 0x8b, 0xef, 0x81,
+	0x9f, 0x67, 0xca, 0xaa, 0x9c, 0x3b, 0x1c, 0xc3, 0xc0, 0xf7, 0x21, 0xf8, 0xc2, 0xa6, 0x4e, 0xf7,
+	0x9c, 0x39, 0x58, 0xca, 0x6e, 0x07, 0x02, 0xb3, 0xac, 0x5b, 0xbf, 0x10, 0x74, 0x0e, 0x2c, 0x0d,
+	0x6f, 0x43, 0xcf, 0xfd, 0x72, 0xf8, 0xa6, 0x8b, 0xbd, 0xf4, 0xef, 0xad, 0xaf, 0x36, 0x1f, 0x59,
+	0xb5, 0xde, 0x89, 0xb7, 0x89, 0xf0, 0x0e, 0x2c, 0x3b, 0xee, 0x51, 0x41, 0xe5, 0x74, 0xfe, 0x15,
+	0x37, 0x1c, 0xd0, 0x7a, 0xfa, 0x89, 0x87, 0x5f, 0x40, 0xb7, 0x9a, 0x30, 0xae, 0xbf, 0x8e, 0xf6,
+	0xc8, 0xe7, 0xa6, 0x1f, 0x76, 0xec, 0x8f, 0xfd, 0xe8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb8,
+	0x55, 0x8e, 0x9b, 0xc1, 0x05, 0x00, 0x00,
+}
+
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
 var _ grpc.ClientConn
@@ -861,6 +786,7 @@ const _ = grpc.SupportPackageIsVersion4
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type PilosaClient interface {
 	QueryPQL(ctx context.Context, in *QueryPQLRequest, opts ...grpc.CallOption) (Pilosa_QueryPQLClient, error)
+	QueryPQLUnary(ctx context.Context, in *QueryPQLRequest, opts ...grpc.CallOption) (*TableResponse, error)
 	Inspect(ctx context.Context, in *InspectRequest, opts ...grpc.CallOption) (Pilosa_InspectClient, error)
 }
 
@@ -904,6 +830,15 @@ func (x *pilosaQueryPQLClient) Recv() (*RowResponse, error) {
 	return m, nil
 }
 
+func (c *pilosaClient) QueryPQLUnary(ctx context.Context, in *QueryPQLRequest, opts ...grpc.CallOption) (*TableResponse, error) {
+	out := new(TableResponse)
+	err := c.cc.Invoke(ctx, "/pilosa.Pilosa/QueryPQLUnary", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *pilosaClient) Inspect(ctx context.Context, in *InspectRequest, opts ...grpc.CallOption) (Pilosa_InspectClient, error) {
 	stream, err := c.cc.NewStream(ctx, &_Pilosa_serviceDesc.Streams[1], "/pilosa.Pilosa/Inspect", opts...)
 	if err != nil {
@@ -939,9 +874,24 @@ func (x *pilosaInspectClient) Recv() (*RowResponse, error) {
 // PilosaServer is the server API for Pilosa service.
 type PilosaServer interface {
 	QueryPQL(*QueryPQLRequest, Pilosa_QueryPQLServer) error
+	QueryPQLUnary(context.Context, *QueryPQLRequest) (*TableResponse, error)
 	Inspect(*InspectRequest, Pilosa_InspectServer) error
 }
 
+// UnimplementedPilosaServer can be embedded to have forward compatible implementations.
+type UnimplementedPilosaServer struct {
+}
+
+func (*UnimplementedPilosaServer) QueryPQL(req *QueryPQLRequest, srv Pilosa_QueryPQLServer) error {
+	return status.Errorf(codes.Unimplemented, "method QueryPQL not implemented")
+}
+func (*UnimplementedPilosaServer) QueryPQLUnary(ctx context.Context, req *QueryPQLRequest) (*TableResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method QueryPQLUnary not implemented")
+}
+func (*UnimplementedPilosaServer) Inspect(req *InspectRequest, srv Pilosa_InspectServer) error {
+	return status.Errorf(codes.Unimplemented, "method Inspect not implemented")
+}
+
 func RegisterPilosaServer(s *grpc.Server, srv PilosaServer) {
 	s.RegisterService(&_Pilosa_serviceDesc, srv)
 }
@@ -967,6 +917,24 @@ func (x *pilosaQueryPQLServer) Send(m *RowResponse) error {
 	return x.ServerStream.SendMsg(m)
 }
 
+func _Pilosa_QueryPQLUnary_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(QueryPQLRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PilosaServer).QueryPQLUnary(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/pilosa.Pilosa/QueryPQLUnary",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PilosaServer).QueryPQLUnary(ctx, req.(*QueryPQLRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Pilosa_Inspect_Handler(srv interface{}, stream grpc.ServerStream) error {
 	m := new(InspectRequest)
 	if err := stream.RecvMsg(m); err != nil {
@@ -991,7 +959,12 @@ func (x *pilosaInspectServer) Send(m *RowResponse) error {
 var _Pilosa_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "pilosa.Pilosa",
 	HandlerType: (*PilosaServer)(nil),
-	Methods:     []grpc.MethodDesc{},
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "QueryPQLUnary",
+			Handler:    _Pilosa_QueryPQLUnary_Handler,
+		},
+	},
 	Streams: []grpc.StreamDesc{
 		{
 			StreamName:    "QueryPQL",
@@ -1006,45 +979,3 @@ var _Pilosa_serviceDesc = grpc.ServiceDesc{
 	},
 	Metadata: "pilosa.proto",
 }
-
-func init() { proto.RegisterFile("pilosa.proto", fileDescriptor_ef0691a44d1e275c) }
-
-var fileDescriptor_ef0691a44d1e275c = []byte{
-	// 568 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xdd, 0x6e, 0xd3, 0x30,
-	0x14, 0x8e, 0x97, 0x2c, 0x69, 0x4e, 0xc6, 0x00, 0x83, 0x46, 0x54, 0x21, 0x14, 0x72, 0x43, 0x10,
-	0x68, 0x9a, 0xca, 0x8f, 0x04, 0x8c, 0x0b, 0x36, 0x81, 0x5a, 0x01, 0x62, 0x33, 0x62, 0xf7, 0xee,
-	0xe2, 0x96, 0x08, 0x37, 0xce, 0x62, 0x17, 0xe8, 0x2d, 0xcf, 0x02, 0x4f, 0xc4, 0x0b, 0x21, 0x3b,
-	0x3f, 0x4d, 0x2a, 0x95, 0x3b, 0x9f, 0xef, 0xfb, 0xce, 0xf1, 0xf9, 0xb3, 0x61, 0xaf, 0xc8, 0xb8,
-	0x90, 0xf4, 0xb0, 0x28, 0x85, 0x12, 0xd8, 0xad, 0xac, 0xf8, 0x05, 0x5c, 0x3f, 0x5f, 0xb2, 0x72,
-	0x75, 0x76, 0xfe, 0x81, 0xb0, 0xab, 0x25, 0x93, 0x0a, 0xdf, 0x86, 0xdd, 0x2c, 0x4f, 0xd9, 0xcf,
-	0x10, 0x45, 0x28, 0xf1, 0x49, 0x65, 0xe0, 0x1b, 0x60, 0x17, 0x57, 0x3c, 0xdc, 0x31, 0x98, 0x3e,
-	0xc6, 0xaf, 0x20, 0xf8, 0xac, 0xa8, 0x5a, 0xca, 0xb7, 0x65, 0x29, 0x4a, 0x8c, 0xc1, 0x39, 0x15,
-	0x29, 0x33, 0x5e, 0xd7, 0x88, 0x39, 0xe3, 0x10, 0xbc, 0x8f, 0x4c, 0x4a, 0x3a, 0x67, 0xb5, 0x63,
-	0x63, 0xc6, 0xbf, 0x11, 0x04, 0x44, 0xfc, 0x20, 0x4c, 0x16, 0x22, 0x97, 0x0c, 0x3f, 0x06, 0xef,
-	0x2b, 0xa3, 0x29, 0x2b, 0x65, 0x88, 0x22, 0x3b, 0x09, 0x46, 0xf8, 0xb0, 0xce, 0xf7, 0x54, 0xf0,
-	0xe5, 0x22, 0x9f, 0xe4, 0x33, 0x41, 0x1a, 0x09, 0x3e, 0x02, 0xef, 0xd2, 0xc0, 0x32, 0xdc, 0x31,
-	0xea, 0x83, 0xbe, 0xba, 0x09, 0x4b, 0x1a, 0x19, 0x7e, 0xd6, 0x4b, 0x36, 0xb4, 0x23, 0x94, 0x04,
-	0xa3, 0x5b, 0x8d, 0x57, 0x87, 0x22, 0x5d, 0x5d, 0x7c, 0x0c, 0xb0, 0xbe, 0x5f, 0x97, 0x98, 0xd3,
-	0x05, 0xab, 0x1b, 0x63, 0xce, 0x78, 0x08, 0x83, 0x94, 0x2a, 0xaa, 0x56, 0x45, 0x53, 0x63, 0x6b,
-	0xc7, 0x7f, 0x77, 0x60, 0xbf, 0x9f, 0x10, 0xbe, 0x07, 0xbe, 0x54, 0x65, 0x96, 0xcf, 0x2f, 0x28,
-	0xaf, 0xe2, 0x8c, 0x2d, 0xb2, 0x86, 0x34, 0xbf, 0xcc, 0x72, 0xf5, 0xfc, 0xa9, 0xe6, 0x75, 0x3c,
-	0x47, 0xf3, 0x2d, 0x84, 0xef, 0xc2, 0xa0, 0xa5, 0x75, 0x11, 0xf6, 0xd8, 0x22, 0x2d, 0x82, 0x87,
-	0xe0, 0x4d, 0x85, 0xe0, 0x9a, 0x74, 0x22, 0x94, 0x0c, 0xc6, 0x16, 0x69, 0x00, 0xc3, 0x71, 0x31,
-	0xd5, 0xdc, 0x6e, 0x84, 0x92, 0x3d, 0xc3, 0x55, 0x00, 0x7e, 0x0d, 0xfb, 0xd5, 0x15, 0x6f, 0xca,
-	0x92, 0xae, 0xb4, 0xc4, 0xed, 0x37, 0xe8, 0xcb, 0x9a, 0x1d, 0x5b, 0x64, 0x43, 0xac, 0xdd, 0xab,
-	0x0a, 0x5a, 0x77, 0x6f, 0xb3, 0xbf, 0x2d, 0xab, 0xdd, 0xfb, 0x62, 0x1c, 0x01, 0xcc, 0xb8, 0xa0,
-	0x75, 0x55, 0x83, 0x08, 0x25, 0x68, 0x6c, 0x91, 0x0e, 0x76, 0x12, 0x80, 0x5f, 0x0d, 0xf2, 0x82,
-	0xf2, 0xf8, 0x0f, 0x82, 0xfd, 0x49, 0x2e, 0x0b, 0x76, 0xa9, 0xfe, 0xbf, 0xb2, 0x8f, 0xba, 0x5b,
-	0xa2, 0xf3, 0xb9, 0xd9, 0xe4, 0x33, 0x49, 0xe5, 0xa7, 0xf2, 0x3d, 0x5b, 0xc9, 0xf5, 0x82, 0xc4,
-	0xb0, 0x37, 0xcb, 0xb8, 0x62, 0xe5, 0xbb, 0x8c, 0xf1, 0x54, 0x86, 0x76, 0x64, 0x27, 0x3e, 0xe9,
-	0x61, 0xfa, 0x1a, 0x9e, 0x2d, 0x32, 0x65, 0x9a, 0xeb, 0x90, 0xca, 0xc0, 0x07, 0xe0, 0x8a, 0xd9,
-	0x4c, 0x32, 0x65, 0xfa, 0xea, 0x90, 0xda, 0x8a, 0xef, 0x43, 0xd0, 0x69, 0x9b, 0x5e, 0x9e, 0xef,
-	0x94, 0x57, 0xeb, 0xed, 0x10, 0x73, 0xd6, 0x92, 0x4e, 0x6b, 0x7a, 0x12, 0xbf, 0x96, 0xcc, 0xc1,
-	0x6f, 0xb3, 0xc5, 0x0f, 0xc0, 0xce, 0x52, 0x69, 0xaa, 0xdc, 0x3a, 0x1c, 0xad, 0xc0, 0x0f, 0xc1,
-	0xf9, 0xc6, 0x56, 0x4d, 0xdd, 0x5b, 0xe6, 0x60, 0x24, 0x27, 0x2e, 0x38, 0x7a, 0x59, 0x47, 0xbf,
-	0x10, 0xb8, 0x67, 0x46, 0x86, 0x8f, 0x61, 0xd0, 0x7c, 0x0a, 0xf8, 0x4e, 0xe3, 0xbb, 0xf1, 0x4d,
-	0x0c, 0xdb, 0xa0, 0x9d, 0x67, 0x1c, 0x5b, 0x47, 0x08, 0xbf, 0x04, 0xaf, 0x1e, 0x0f, 0x6e, 0x9f,
-	0x65, 0x7f, 0x5e, 0x5b, 0x7d, 0xa7, 0xae, 0xf9, 0x9d, 0x9e, 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff,
-	0x9e, 0xd3, 0x7d, 0xab, 0xad, 0x04, 0x00, 0x00,
-}
diff --git a/proto/pilosa.proto b/proto/pilosa.proto
index b7b30d521..144e9e480 100644
--- a/proto/pilosa.proto
+++ b/proto/pilosa.proto
@@ -17,6 +17,16 @@ message RowResponse{
   StatusError StatusError = 3;
 }
 
+message Row {
+  repeated ColumnResponse columns = 1;
+}
+
+message TableResponse{
+  repeated ColumnInfo headers = 1;
+  repeated Row rows = 2;
+  StatusError StatusError = 3;
+}
+
 message ColumnInfo {
   string name = 1;
   string datatype = 2;
@@ -60,5 +70,6 @@ message IdsOrKeys {
 
 service Pilosa {
   rpc QueryPQL(QueryPQLRequest) returns (stream RowResponse) {};
+  rpc QueryPQLUnary(QueryPQLRequest) returns (TableResponse) {};
   rpc Inspect(InspectRequest) returns (stream RowResponse) {};
 }
diff --git a/server/grpc.go b/server/grpc.go
index def1bb768..b1d382f79 100644
--- a/server/grpc.go
+++ b/server/grpc.go
@@ -76,6 +76,29 @@ func (h grpcHandler) QueryPQL(req *pb.QueryPQLRequest, stream pb.Pilosa_QueryPQL
 	return nil
 }
 
+// QueryPQLUnary is a unary-response (non-streaming) version of QueryPQL, returning a TableResponse.
+func (h grpcHandler) QueryPQLUnary(ctx context.Context, req *pb.QueryPQLRequest) (*pb.TableResponse, error) {
+	query := pilosa.QueryRequest{
+		Index: req.Index,
+		Query: req.Pql,
+	}
+	resp, err := h.api.Query(context.Background(), &query)
+	if err != nil {
+		return nil, errToStatusError(err)
+	}
+	response := &pb.TableResponse{
+		Rows: make([]*pb.Row, 0),
+	}
+	for row := range makeRows(resp, h.logger) {
+		if len(row.Headers) != 0 {
+			response.Headers = row.Headers
+		}
+		response.Rows = append(response.Rows, &pb.Row{Columns: row.Columns})
+	}
+
+	return response, nil
+}
+
 // fieldDataType returns a useful data type (string,
 // uint64, bool, etc.) based on the Pilosa field type.
 func fieldDataType(f *pilosa.Field) string {