diff --git a/proto/proto3_proto/proto3.pb.go b/proto/proto3_proto/proto3.pb.go
index 19383ef..2f2859a 100644
--- a/proto/proto3_proto/proto3.pb.go
+++ b/proto/proto3_proto/proto3.pb.go
@@ -28,7 +28,9 @@
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
+// 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
 
 type Message_Humour int32
 
@@ -65,10 +67,10 @@
 	ResultCount  int64                            `protobuf:"varint,7,opt,name=result_count,json=resultCount" json:"result_count,omitempty"`
 	TrueScotsman bool                             `protobuf:"varint,8,opt,name=true_scotsman,json=trueScotsman" json:"true_scotsman,omitempty"`
 	Score        float32                          `protobuf:"fixed32,9,opt,name=score" json:"score,omitempty"`
-	Key          []uint64                         `protobuf:"varint,5,rep,name=key" json:"key,omitempty"`
-	ShortKey     []int32                          `protobuf:"varint,19,rep,name=short_key,json=shortKey" json:"short_key,omitempty"`
+	Key          []uint64                         `protobuf:"varint,5,rep,packed,name=key" json:"key,omitempty"`
+	ShortKey     []int32                          `protobuf:"varint,19,rep,packed,name=short_key,json=shortKey" json:"short_key,omitempty"`
 	Nested       *Nested                          `protobuf:"bytes,6,opt,name=nested" json:"nested,omitempty"`
-	RFunny       []Message_Humour                 `protobuf:"varint,16,rep,name=r_funny,json=rFunny,enum=proto3_proto.Message_Humour" json:"r_funny,omitempty"`
+	RFunny       []Message_Humour                 `protobuf:"varint,16,rep,packed,name=r_funny,json=rFunny,enum=proto3_proto.Message_Humour" json:"r_funny,omitempty"`
 	Terrain      map[string]*Nested               `protobuf:"bytes,10,rep,name=terrain" json:"terrain,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	Proto2Field  *testdata.SubDefaults            `protobuf:"bytes,11,opt,name=proto2_field,json=proto2Field" json:"proto2_field,omitempty"`
 	Proto2Value  map[string]*testdata.SubDefaults `protobuf:"bytes,13,rep,name=proto2_value,json=proto2Value" json:"proto2_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
@@ -83,6 +85,69 @@
 func (*Message) ProtoMessage()               {}
 func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
+func (m *Message) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Message) GetHilarity() Message_Humour {
+	if m != nil {
+		return m.Hilarity
+	}
+	return Message_UNKNOWN
+}
+
+func (m *Message) GetHeightInCm() uint32 {
+	if m != nil {
+		return m.HeightInCm
+	}
+	return 0
+}
+
+func (m *Message) GetData() []byte {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func (m *Message) GetResultCount() int64 {
+	if m != nil {
+		return m.ResultCount
+	}
+	return 0
+}
+
+func (m *Message) GetTrueScotsman() bool {
+	if m != nil {
+		return m.TrueScotsman
+	}
+	return false
+}
+
+func (m *Message) GetScore() float32 {
+	if m != nil {
+		return m.Score
+	}
+	return 0
+}
+
+func (m *Message) GetKey() []uint64 {
+	if m != nil {
+		return m.Key
+	}
+	return nil
+}
+
+func (m *Message) GetShortKey() []int32 {
+	if m != nil {
+		return m.ShortKey
+	}
+	return nil
+}
+
 func (m *Message) GetNested() *Nested {
 	if m != nil {
 		return m.Nested
@@ -90,6 +155,13 @@
 	return nil
 }
 
+func (m *Message) GetRFunny() []Message_Humour {
+	if m != nil {
+		return m.RFunny
+	}
+	return nil
+}
+
 func (m *Message) GetTerrain() map[string]*Nested {
 	if m != nil {
 		return m.Terrain
@@ -149,6 +221,20 @@
 func (*Nested) ProtoMessage()               {}
 func (*Nested) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
+func (m *Nested) GetBunny() string {
+	if m != nil {
+		return m.Bunny
+	}
+	return ""
+}
+
+func (m *Nested) GetCute() bool {
+	if m != nil {
+		return m.Cute
+	}
+	return false
+}
+
 type MessageWithMap struct {
 	ByteMapping map[bool][]byte `protobuf:"bytes,1,rep,name=byte_mapping,json=byteMapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
@@ -172,48 +258,51 @@
 	proto.RegisterEnum("proto3_proto.Message_Humour", Message_Humour_name, Message_Humour_value)
 }
 
+func init() { proto.RegisterFile("proto3_proto/proto3.proto", fileDescriptor0) }
+
 var fileDescriptor0 = []byte{
-	// 669 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x53, 0x6d, 0x6f, 0xd3, 0x3a,
-	0x18, 0xbd, 0x7d, 0x4f, 0x9f, 0xa4, 0x5b, 0xae, 0xb7, 0x2b, 0x79, 0xbd, 0x7c, 0x18, 0x45, 0x42,
-	0x13, 0x2f, 0x19, 0x14, 0x21, 0x4d, 0x08, 0x81, 0xb6, 0xb1, 0x89, 0x6a, 0x5d, 0xa9, 0xdc, 0x8d,
-	0x89, 0x4f, 0x51, 0xd2, 0xba, 0x6d, 0x44, 0xe3, 0x54, 0x89, 0x83, 0x94, 0xbf, 0xc3, 0x1f, 0x05,
-	0xbf, 0xa4, 0x5d, 0x36, 0x75, 0xf0, 0x29, 0xf6, 0x79, 0xce, 0xf1, 0xf3, 0xe4, 0xf8, 0x18, 0xf6,
-	0x96, 0x71, 0xc4, 0xa3, 0x37, 0xae, 0xfa, 0x1c, 0xea, 0x8d, 0xa3, 0x3e, 0xc8, 0x2a, 0x96, 0xda,
-	0x7b, 0xb3, 0x28, 0x9a, 0x2d, 0xa8, 0xa6, 0xf8, 0xe9, 0xf4, 0xd0, 0x63, 0x99, 0x26, 0xb6, 0x77,
-	0x38, 0x4d, 0xf8, 0xc4, 0xe3, 0xde, 0xa1, 0x5c, 0x68, 0xb0, 0xf3, 0xab, 0x01, 0x8d, 0x4b, 0x9a,
-	0x24, 0xde, 0x8c, 0x22, 0x04, 0x55, 0xe6, 0x85, 0x14, 0x97, 0xf6, 0x4b, 0x07, 0x4d, 0xa2, 0xd6,
-	0xe8, 0x08, 0x8c, 0x79, 0xb0, 0xf0, 0xe2, 0x80, 0x67, 0xb8, 0x2c, 0xf0, 0xad, 0xee, 0x23, 0xa7,
-	0xd8, 0xd0, 0xc9, 0xc5, 0xce, 0xe7, 0x34, 0x8c, 0xd2, 0x98, 0xac, 0xd9, 0x68, 0x1f, 0xac, 0x39,
-	0x0d, 0x66, 0x73, 0xee, 0x06, 0xcc, 0x1d, 0x87, 0xb8, 0x22, 0xd4, 0x2d, 0x02, 0x1a, 0xeb, 0xb1,
-	0xd3, 0x50, 0xf6, 0x93, 0xe3, 0xe0, 0xaa, 0xa8, 0x58, 0x44, 0xad, 0xd1, 0x63, 0xb0, 0x62, 0x9a,
-	0xa4, 0x0b, 0xee, 0x8e, 0xa3, 0x94, 0x71, 0xdc, 0x10, 0xb5, 0x0a, 0x31, 0x35, 0x76, 0x2a, 0x21,
-	0xf4, 0x04, 0x5a, 0x3c, 0x4e, 0xa9, 0x9b, 0x8c, 0x23, 0x9e, 0x84, 0x1e, 0xc3, 0x86, 0xe0, 0x18,
-	0xc4, 0x92, 0xe0, 0x28, 0xc7, 0xd0, 0x2e, 0xd4, 0x44, 0x3d, 0xa6, 0xb8, 0x29, 0x8a, 0x65, 0xa2,
-	0x37, 0xc8, 0x86, 0xca, 0x77, 0x9a, 0xe1, 0xda, 0x7e, 0xe5, 0xa0, 0x4a, 0xe4, 0x12, 0xfd, 0x0f,
-	0xcd, 0x64, 0x1e, 0xc5, 0xdc, 0x95, 0xf8, 0x8e, 0xc0, 0x6b, 0xc4, 0x50, 0xc0, 0x85, 0x28, 0xbe,
-	0x80, 0x3a, 0x13, 0x56, 0xd1, 0x09, 0xae, 0x8b, 0x53, 0xcc, 0xee, 0xee, 0xdd, 0x5f, 0x1f, 0xa8,
-	0x1a, 0xc9, 0x39, 0xe8, 0x2d, 0x34, 0x62, 0x77, 0x9a, 0x32, 0x96, 0x61, 0x5b, 0x1c, 0xf4, 0x37,
-	0xa7, 0xea, 0xf1, 0xb9, 0xe4, 0xa2, 0xf7, 0xd0, 0xe0, 0x34, 0x8e, 0xbd, 0x80, 0x61, 0x10, 0x32,
-	0xb3, 0xdb, 0xd9, 0x2c, 0xbb, 0xd2, 0xa4, 0x33, 0xc6, 0xe3, 0x8c, 0xac, 0x24, 0xe2, 0x7e, 0xf4,
-	0xfd, 0x77, 0xdd, 0x69, 0x40, 0x17, 0x13, 0x6c, 0xaa, 0x41, 0xff, 0x73, 0x56, 0x77, 0xed, 0x8c,
-	0x52, 0xff, 0x13, 0x9d, 0x7a, 0xc2, 0xbd, 0x84, 0x98, 0x9a, 0x7a, 0x2e, 0x99, 0xa8, 0xb7, 0x56,
-	0xfe, 0xf0, 0x16, 0x29, 0xc5, 0x2d, 0xd5, 0xfc, 0xe9, 0xe6, 0xe6, 0x43, 0xc5, 0xfc, 0x2a, 0x89,
-	0x7a, 0x80, 0xfc, 0x28, 0x85, 0xa0, 0x57, 0x60, 0x88, 0x98, 0xf1, 0x79, 0xc0, 0x66, 0x78, 0x2b,
-	0x77, 0x4a, 0xe7, 0xd0, 0x59, 0xe5, 0xd0, 0x39, 0x66, 0x19, 0x59, 0xb3, 0x84, 0x57, 0xa6, 0xb8,
-	0xa5, 0xcc, 0x55, 0xbb, 0x04, 0x6f, 0xab, 0xde, 0x9b, 0x45, 0x20, 0x89, 0x57, 0x8a, 0x27, 0x64,
-	0x90, 0xa4, 0x7e, 0xa8, 0x87, 0xc2, 0xff, 0xe6, 0xff, 0xba, 0x69, 0x62, 0x52, 0x20, 0xa2, 0xd7,
-	0x60, 0x8c, 0x45, 0x2e, 0x27, 0x31, 0x65, 0x18, 0xa9, 0x56, 0x0f, 0x88, 0xd6, 0xb4, 0xf6, 0x10,
-	0xac, 0xa2, 0xe1, 0xab, 0xe4, 0xe8, 0xa7, 0xa1, 0x92, 0xf3, 0x0c, 0x6a, 0xda, 0xb8, 0xf2, 0x1f,
-	0xb2, 0xa1, 0x29, 0xef, 0xca, 0x47, 0xa5, 0xf6, 0x35, 0xd8, 0xf7, 0x5d, 0xdc, 0x70, 0xea, 0xf3,
-	0xbb, 0xa7, 0x3e, 0x70, 0x91, 0xb7, 0xc7, 0x76, 0x3e, 0x42, 0x5d, 0x07, 0x0a, 0x99, 0xd0, 0xb8,
-	0x1e, 0x5c, 0x0c, 0xbe, 0xdc, 0x0c, 0xec, 0x7f, 0x90, 0x01, 0xd5, 0xe1, 0xf5, 0x60, 0x64, 0x97,
-	0x50, 0x0b, 0x9a, 0xa3, 0xfe, 0xf1, 0x70, 0x74, 0xd5, 0x3b, 0xbd, 0xb0, 0xcb, 0x68, 0x1b, 0xcc,
-	0x93, 0x5e, 0xbf, 0xef, 0x9e, 0x1c, 0xf7, 0xfa, 0x67, 0xdf, 0xec, 0x4a, 0xa7, 0x0b, 0x75, 0x3d,
-	0xac, 0x7c, 0x33, 0xbe, 0x8a, 0xaf, 0x9e, 0x47, 0x6f, 0xe4, 0x2b, 0x1d, 0xa7, 0x5c, 0x0f, 0x64,
-	0x10, 0xb5, 0xee, 0xfc, 0x2c, 0xc1, 0x56, 0xee, 0xd9, 0x4d, 0xc0, 0xe7, 0x97, 0xde, 0x12, 0x09,
-	0xc3, 0xfc, 0x8c, 0x53, 0x37, 0xf4, 0x96, 0x4b, 0x99, 0x83, 0x92, 0xf2, 0xf9, 0xe5, 0x46, 0x9f,
-	0x73, 0x8d, 0x73, 0x22, 0x04, 0x97, 0x9a, 0x9f, 0xa7, 0xca, 0xbf, 0x45, 0xda, 0x1f, 0xc0, 0xbe,
-	0x4f, 0x28, 0x1a, 0x66, 0x68, 0xc3, 0x76, 0x8b, 0x86, 0x59, 0x05, 0x67, 0xfc, 0xba, 0x6e, 0xfd,
-	0x3b, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x40, 0x3c, 0xbe, 0x3c, 0x05, 0x00, 0x00,
+	// 680 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x93, 0x6d, 0x6b, 0xdb, 0x3a,
+	0x14, 0xc7, 0xaf, 0xe3, 0x3c, 0x38, 0xc7, 0x4e, 0xeb, 0xab, 0xf6, 0x82, 0x9a, 0x7b, 0x5f, 0xf8,
+	0x66, 0x30, 0xcc, 0x1e, 0xdc, 0x2d, 0xa3, 0x50, 0xc6, 0xd8, 0x68, 0xbb, 0x96, 0x85, 0xa6, 0x59,
+	0x50, 0xda, 0x95, 0xbd, 0x32, 0x4e, 0xa2, 0x24, 0x66, 0xb1, 0x1c, 0x6c, 0x79, 0xe0, 0xaf, 0xb3,
+	0x2f, 0xba, 0x21, 0xc9, 0x49, 0xdd, 0x92, 0x6e, 0xaf, 0x7c, 0xf4, 0xf7, 0xef, 0xe8, 0x1c, 0xfd,
+	0x75, 0x04, 0x07, 0xab, 0x24, 0xe6, 0xf1, 0x1b, 0x5f, 0x7e, 0x0e, 0xd5, 0xc2, 0x93, 0x1f, 0x64,
+	0x95, 0x7f, 0xb5, 0x0f, 0xe6, 0x71, 0x3c, 0x5f, 0x52, 0x85, 0x8c, 0xb3, 0xd9, 0x61, 0xc0, 0x72,
+	0x05, 0xb6, 0xf7, 0x38, 0x4d, 0xf9, 0x34, 0xe0, 0xc1, 0xa1, 0x08, 0x94, 0xd8, 0xf9, 0xd9, 0x80,
+	0xc6, 0x15, 0x4d, 0xd3, 0x60, 0x4e, 0x11, 0x82, 0x2a, 0x0b, 0x22, 0x8a, 0x35, 0x47, 0x73, 0x9b,
+	0x44, 0xc6, 0xe8, 0x18, 0x8c, 0x45, 0xb8, 0x0c, 0x92, 0x90, 0xe7, 0xb8, 0xe2, 0x68, 0xee, 0x4e,
+	0xf7, 0x3f, 0xaf, 0x5c, 0xd0, 0x2b, 0x92, 0xbd, 0x4f, 0x59, 0x14, 0x67, 0x09, 0xd9, 0xd0, 0xc8,
+	0x01, 0x6b, 0x41, 0xc3, 0xf9, 0x82, 0xfb, 0x21, 0xf3, 0x27, 0x11, 0xd6, 0x1d, 0xcd, 0x6d, 0x11,
+	0x50, 0x5a, 0x8f, 0x9d, 0x45, 0xa2, 0x9e, 0x68, 0x07, 0x57, 0x1d, 0xcd, 0xb5, 0x88, 0x8c, 0xd1,
+	0xff, 0x60, 0x25, 0x34, 0xcd, 0x96, 0xdc, 0x9f, 0xc4, 0x19, 0xe3, 0xb8, 0xe1, 0x68, 0xae, 0x4e,
+	0x4c, 0xa5, 0x9d, 0x09, 0x09, 0x3d, 0x81, 0x16, 0x4f, 0x32, 0xea, 0xa7, 0x93, 0x98, 0xa7, 0x51,
+	0xc0, 0xb0, 0xe1, 0x68, 0xae, 0x41, 0x2c, 0x21, 0x8e, 0x0a, 0x0d, 0xed, 0x43, 0x2d, 0x9d, 0xc4,
+	0x09, 0xc5, 0x4d, 0x47, 0x73, 0x2b, 0x44, 0x2d, 0x90, 0x0d, 0xfa, 0x37, 0x9a, 0xe3, 0x9a, 0xa3,
+	0xbb, 0x55, 0x22, 0x42, 0xf4, 0x2f, 0x34, 0xd3, 0x45, 0x9c, 0x70, 0x5f, 0xe8, 0x7b, 0x8e, 0xee,
+	0xd6, 0x88, 0x21, 0x85, 0x4b, 0x9a, 0xa3, 0x17, 0x50, 0x67, 0x34, 0xe5, 0x74, 0x8a, 0xeb, 0x8e,
+	0xe6, 0x9a, 0xdd, 0xfd, 0xfb, 0x47, 0x1f, 0xc8, 0x7f, 0xa4, 0x60, 0xd0, 0x11, 0x34, 0x12, 0x7f,
+	0x96, 0x31, 0x96, 0x63, 0xdb, 0xd1, 0xff, 0xe8, 0x54, 0x3d, 0xb9, 0x10, 0x2c, 0x7a, 0x07, 0x0d,
+	0x4e, 0x93, 0x24, 0x08, 0x19, 0x06, 0x47, 0x77, 0xcd, 0x6e, 0x67, 0x7b, 0xda, 0xb5, 0x82, 0xce,
+	0x19, 0x4f, 0x72, 0xb2, 0x4e, 0x41, 0xc7, 0xa0, 0xee, 0xbf, 0xeb, 0xcf, 0x42, 0xba, 0x9c, 0x62,
+	0x53, 0x36, 0xfa, 0x8f, 0xb7, 0xbe, 0x6b, 0x6f, 0x94, 0x8d, 0x3f, 0xd2, 0x59, 0x90, 0x2d, 0x79,
+	0x4a, 0x4c, 0x85, 0x5e, 0x08, 0x12, 0xf5, 0x36, 0x99, 0xdf, 0x83, 0x65, 0x46, 0x71, 0x4b, 0x16,
+	0x7f, 0xba, 0xbd, 0xf8, 0x50, 0x92, 0x5f, 0x04, 0xa8, 0x1a, 0x28, 0xb6, 0x92, 0x0a, 0x7a, 0x05,
+	0x46, 0xc0, 0x72, 0xbe, 0x08, 0xd9, 0x1c, 0xef, 0x14, 0x4e, 0xa9, 0x39, 0xf4, 0xd6, 0x73, 0xe8,
+	0x9d, 0xb0, 0x9c, 0x6c, 0x28, 0x74, 0x04, 0x66, 0x14, 0xb0, 0xdc, 0x97, 0xab, 0x14, 0xef, 0xca,
+	0xda, 0xdb, 0x93, 0x40, 0x80, 0xd7, 0x92, 0x43, 0x47, 0x00, 0x69, 0x36, 0x8e, 0x54, 0x53, 0xf8,
+	0xef, 0xe2, 0xac, 0xdb, 0x3a, 0x26, 0x25, 0x10, 0xbd, 0x06, 0x63, 0xb2, 0x08, 0x97, 0xd3, 0x84,
+	0x32, 0x8c, 0x64, 0xa9, 0x47, 0x92, 0x36, 0x58, 0x7b, 0x08, 0x56, 0xd9, 0xf0, 0xf5, 0xe4, 0xa8,
+	0xa7, 0x21, 0x27, 0xe7, 0x19, 0xd4, 0x94, 0x71, 0x95, 0xdf, 0xcc, 0x86, 0x42, 0xde, 0x56, 0x8e,
+	0xb5, 0xf6, 0x0d, 0xd8, 0x0f, 0x5d, 0xdc, 0xb2, 0xeb, 0xf3, 0xfb, 0xbb, 0x3e, 0x72, 0x91, 0x77,
+	0xdb, 0x76, 0x3e, 0x40, 0x5d, 0x0d, 0x14, 0x32, 0xa1, 0x71, 0x33, 0xb8, 0x1c, 0x7c, 0xbe, 0x1d,
+	0xd8, 0x7f, 0x21, 0x03, 0xaa, 0xc3, 0x9b, 0xc1, 0xc8, 0xd6, 0x50, 0x0b, 0x9a, 0xa3, 0xfe, 0xc9,
+	0x70, 0x74, 0xdd, 0x3b, 0xbb, 0xb4, 0x2b, 0x68, 0x17, 0xcc, 0xd3, 0x5e, 0xbf, 0xef, 0x9f, 0x9e,
+	0xf4, 0xfa, 0xe7, 0x5f, 0x6d, 0xbd, 0xd3, 0x85, 0xba, 0x6a, 0x56, 0xbc, 0x99, 0xb1, 0x1c, 0x5f,
+	0xd5, 0x8f, 0x5a, 0x88, 0x57, 0x3a, 0xc9, 0xb8, 0x6a, 0xc8, 0x20, 0x32, 0xee, 0xfc, 0xd0, 0x60,
+	0xa7, 0xf0, 0xec, 0x36, 0xe4, 0x8b, 0xab, 0x60, 0x85, 0x86, 0x60, 0x8d, 0x73, 0x4e, 0xfd, 0x28,
+	0x58, 0xad, 0xc4, 0x1c, 0x68, 0xd2, 0xe7, 0x97, 0x5b, 0x7d, 0x2e, 0x72, 0xbc, 0xd3, 0x9c, 0xd3,
+	0x2b, 0xc5, 0x17, 0x53, 0x35, 0xbe, 0x53, 0xda, 0xef, 0xc1, 0x7e, 0x08, 0x94, 0x0d, 0x33, 0x94,
+	0x61, 0xfb, 0x65, 0xc3, 0xac, 0x92, 0x33, 0xe3, 0xba, 0x2a, 0xfd, 0x2b, 0x00, 0x00, 0xff, 0xff,
+	0x8b, 0x40, 0x3c, 0xbe, 0x3c, 0x05, 0x00, 0x00,
 }