osm 1.2.18.dev.8 → 1.2.18.dev.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk0YzM4NThhMzM4ZGE0NmVkN2E2NjMyNmQwYjE0NTliZDBkZjU5OQ==
+    YWZhOTg0ZjAwNzk1YjE3ZmY0YTJlNjI0ZWRjZmFiMWFkMTc5YTk1OQ==
   data.tar.gz: !binary |-
-    NjYxMjZiOTI3MzJkYzY2Mzc0MjJhMWM0ZTU0M2U4MDkyZjRjMTZiZQ==
+    MGQ3M2MyNTk0MWRlNjNkMmYwNWU2OTc4MjBhYjAxMmQ4OGUxZjE1Nw==
 SHA512:
   metadata.gz: !binary |-
-    MjA2YzhlNWQ1OWMzZDNlNWM5ZDM2NzViZDRmZGY1ZGNhYzRkZjNkYzdlNzg4
-    OTBiMDljNmEyYjk0NWMyMmQ3NmExYjRiYjE0ODU0NGRmZWJkNGM1NjhmYjEw
-    YTVhNzg3YzVmZTRlNDU2OWIxMjFkZWIxYWU5ZGI0NTkxMTBkM2M=
+    ZDkwMjA5NTYyYTRiMTEzMGNiMzNhNzFiM2E2MTEwZmQwNDc1NjE3NDcyYjM2
+    ZTcxNGQwOTE5YjFhMTU5ZmMyMWQxODNmMTExN2MyNDNjMWIwY2ExMjYxNDdh
+    OTM3ZmQ3NWEyOWJlMmUxMGMyM2QzMmE4MmE1M2FhNjc1NDIzYzM=
   data.tar.gz: !binary |-
-    MmIxZjgzOTJmMzM3YWYwMmQ0MmNmN2Y3ZTBkZTU5YWZhZmE5NjU0MjgzNTgw
-    YTkzYmM2Y2MzYzVmZGQyODVjZDNjMmRlNmE1ZTRlYjQ4N2EwNjcwMjY4ZWRm
-    ZTk3NTM0Y2E4YTQwMmJiNmU4ZmY3MjY5MjkzYzhkNzA0ZTE1ODE=
+    YzhjNDRkZWVlNjdlZjljYWU2ODkyNDZjODliODllYzcyZmI4Y2RiYTBhNTQx
+    MGRiZWM5YzMyMWI4NzJmYTJhYzc1YzgzNTMxZWMwZmIxM2MzNTcwNGNiNGFk
+    MDc2OWMzMDFiNTIxNmUwYjE3YTQzMGM4ODQ2YTc4MWUwZmI1ZDc=

data/CHANGELOG.md

@@ -16,8 +16,8 @@
     * Addition of attibutes:
       * gender (Symbol - :male, :female, :other or :unspecified)
       * finished_section (Date, nil)
-      * custom (DirtyHashy) - The customisable data part from OSM
-      * custom_labels (DirtyHashy) - The labels which belong to the data in custom
+      * additional_information (DirtyHashy) - The customisable data part from OSM
+      * additional_information_labels (DirtyHashy) - The labels which belong to the data in custom
       * primary_contact, secondary_contact, emergency_contact and doctor - the relevant parts from OSM
       * grouping_label
       * grouping_leader_label

data/lib/osm/member.rb

@@ -61,10 +61,10 @@ module Osm
     #   @return [Date] when the member finished the section they were retrieved for
     # @!attribute [rw] joined_movement
     #   @return [Date] when the member joined the movement
-    # @!attribute [rw] custom
-    #   @return [DirtyHashy] the custom data (key is OSM's variable name, value is the data)
-    # @!attribute [rw] custom_labels
-    #   @return [DirtyHashy] the labels for the custom data (key is OSM's variable name, value is the label)
+    # @!attribute [rw] additional_information
+    #   @return [DirtyHashy] the Additional Information (key is OSM's variable name, value is the data)
+    # @!attribute [rw] additional_information_labels
+    #   @return [DirtyHashy] the labels for the additional information (key is OSM's variable name, value is the label)
     # @!attribute [rw] contact
     #   @return [Osm::Member::MemberContact, nil] the member's contact details (nil if hidden in OSM)
     # @!attribute [rw] primary_contact
@@ -90,8 +90,8 @@ module Osm
     attribute :finished_section, :type => Date
     attribute :joined_movement, :type => Date
     attribute :gender, :type => Object
-    attribute :custom, :type => Object, :default => DirtyHashy.new
-    attribute :custom_labels, :type => Object, :default => DirtyHashy.new
+    attribute :additional_information, :type => Object, :default => DirtyHashy.new
+    attribute :additional_information_labels, :type => Object, :default => DirtyHashy.new
     attribute :contact, :type => Object
     attribute :primary_contact, :type => Object
     attribute :secondary_contact, :type => Object
@@ -101,7 +101,8 @@ module Osm
     if ActiveModel::VERSION::MAJOR < 4
       attr_accessible :id, :section_id, :first_name, :last_name, :grouping_id, :grouping_leader,
                       :date_of_birth, :started_section, :finished_section, :joined_movement, :age,
-                      :grouping_label, :grouping_leader_label, :gender, :custom, :custom_labels,
+                      :grouping_label, :grouping_leader_label, :gender,
+                      :additional_information, :additional_information_labels,
                       :contact, :primary_contact, :secondary_contact, :emergency_contact, :doctor
     end
 
@@ -113,8 +114,8 @@ module Osm
     validates_presence_of :last_name
     validates_presence_of :grouping_label, :allow_blank => true
     validates_presence_of :grouping_leader_label, :allow_blank => true
-    validates_presence_of :custom, :allow_blank => true
-    validates_presence_of :custom_labels, :allow_blank => true
+    validates_presence_of :additional_information, :allow_blank => true
+    validates_presence_of :additional_information_labels, :allow_blank => true
     validates_presence_of :date_of_birth
     validates_presence_of :started_section
     validates_presence_of :finished_section, :allow_nil=>true
@@ -212,8 +213,8 @@ module Osm
             receive_phone_2: member_contact[CID_RECIEVE_PHONE_2],
             receive_email_1: member_contact[CID_RECIEVE_EMAIL_1],
             receive_email_2: member_contact[CID_RECIEVE_EMAIL_2],
-            custom: member_custom,
-            custom_labels: custom_labels[GID_MEMBER_CONTACT],
+            additional_information: member_custom,
+            additional_information_labels: custom_labels[GID_MEMBER_CONTACT],
           ),
           :primary_contact => primary_contact.nil? ? nil : PrimaryContact.new(
             first_name: primary_contact[CID_FIRST_NAME],
@@ -231,8 +232,8 @@ module Osm
             receive_phone_2: primary_contact[CID_RECIEVE_PHONE_2],
             receive_email_1: primary_contact[CID_RECIEVE_EMAIL_1],
             receive_email_2: primary_contact[CID_RECIEVE_EMAIL_2],
-            custom: primary_custom,
-            custom_labels: custom_labels[GID_PRIMARY_CONTACT],
+            additional_information: primary_custom,
+            additional_information_labels: custom_labels[GID_PRIMARY_CONTACT],
           ),
           :secondary_contact => secondary_contact.nil? ? nil : SecondaryContact.new(
             first_name: secondary_contact[CID_FIRST_NAME],
@@ -250,8 +251,8 @@ module Osm
             receive_phone_2: secondary_contact[CID_RECIEVE_PHONE_2],
             receive_email_1: secondary_contact[CID_RECIEVE_EMAIL_1],
             receive_email_2: secondary_contact[CID_RECIEVE_EMAIL_2],
-            custom: secondary_custom,
-            custom_labels: custom_labels[GID_SECONDARY_CONTACT],
+            additional_information: secondary_custom,
+            additional_information_labels: custom_labels[GID_SECONDARY_CONTACT],
           ),
           :emergency_contact => emergency_contact.nil? ? nil : EmergencyContact.new(
             first_name: emergency_contact[CID_FIRST_NAME],
@@ -265,8 +266,8 @@ module Osm
             phone_2: emergency_contact[CID_PHONE_2],
             email_1: emergency_contact[CID_EMAIL_1],
             email_2: emergency_contact[CID_EMAIL_2],
-            custom: emergency_custom,
-            custom_labels: custom_labels[GID_EMERGENCY_CONTACT],
+            additional_information: emergency_custom,
+            additional_information_labels: custom_labels[GID_EMERGENCY_CONTACT],
           ),
           :doctor => doctor_contact.nil? ? nil : DoctorContact.new(
             first_name: doctor_contact[CID_FIRST_NAME],
@@ -279,11 +280,11 @@ module Osm
             postcode: doctor_contact[CID_POSTCODE],
             phone_1: doctor_contact[CID_PHONE_1],
             phone_2: doctor_contact[CID_PHONE_2],
-            custom:doctor_custom,
-            custom_labels: custom_labels[GID_DOCTOR_CONTACT],
+            additional_information:doctor_custom,
+            additional_information_labels: custom_labels[GID_DOCTOR_CONTACT],
           ),
-          custom: custom_data,
-          custom_labels: custom_labels[GID_CUSTOM],
+          additional_information: custom_data,
+          additional_information_labels: custom_labels[GID_CUSTOM],
         )
       end
 
@@ -376,8 +377,8 @@ module Osm
       end
 
       # Do custom attributes
-      custom.keys.select{ |a| force || custom.changes.keys.include?(a) }.each do |attr|
-        new_value = custom[attr]
+      additional_information.keys.select{ |a| force || additional_information.changes.keys.include?(a) }.each do |attr|
+        new_value = additional_information[attr]
         data = api.perform_query("ext/customdata/?action=updateColumn&section_id=#{section_id}", {
           'associated_id' => self.id,
           'associated_type' => 'member',
@@ -399,7 +400,7 @@ module Osm
       # Finish off
       if updated
         reset_changed_attributes
-        custom.clean_up!
+        additional_information.clean_up!
         # The cached columns for the members will be out of date - remove them
         Osm::Term.get_for_section(api, section_id).each do |term|
           Osm::Model.cache_delete(api, ['members', section_id, term.id])
@@ -630,10 +631,10 @@ module Osm
       #   @return [String] the primary phone number
       # @!attribute [rw] phone_2
       #   @return [String] the secondary phone number
-      # @!attribute [rw] custom
-      #   @return [DirtyHashy] the custom data (key is OSM's variable name, value is the data)
-      # @!attribute [rw] custom_labels
-      #   @return [DirtyHashy] the labels for the custom data (key is OSM's variable name, value is the label)
+      # @!attribute [rw] additional_information
+      #   @return [DirtyHashy] the additional information (key is OSM's variable name, value is the data)
+      # @!attribute [rw] additional_information_labels
+      #   @return [DirtyHashy] the labels for the additional information (key is OSM's variable name, value is the label)
 
       attribute :first_name, :type => String
       attribute :last_name, :type => String
@@ -644,12 +645,13 @@ module Osm
       attribute :postcode, :type => String
       attribute :phone_1, :type => String
       attribute :phone_2, :type => String
-      attribute :custom, :type => Object, :default => DirtyHashy.new
-      attribute :custom_labels, :type => Object, :default => DirtyHashy.new
+      attribute :additional_information, :type => Object, :default => DirtyHashy.new
+      attribute :additional_information_labels, :type => Object, :default => DirtyHashy.new
 
       if ActiveModel::VERSION::MAJOR < 4
         attr_accessible :first_name, :last_name, :address_1, :address_2, :address_3, :address_4,
-                        :postcode, :phone_1, :phone_2, :custom, :custom_labels
+                        :postcode, :phone_1, :phone_2,
+                        :additional_information, :additional_information_labels
       end
 
       # @!method initialize
@@ -699,13 +701,13 @@ module Osm
         } # our name => OSM name
 
         data = {}
-        attributes.keys.select{ |a| !['custom', 'custom_labels'].include?(a) }.select{ |a| force || changed_attributes.include?(a) }.each do |attr|
+        attributes.keys.select{ |a| !['additional_information', 'additional_information_labels'].include?(a) }.select{ |a| force || changed_attributes.include?(a) }.each do |attr|
           value = send(attr)
           value = 'yes' if value.eql?(true)
           data[attribute_map[attr]] = value
         end
-        custom.keys.select{ |a| force || custom.changes.keys.include?(a) }.each do |attr|
-          data["data[#{attr}]"] = custom[attr]
+        additional_information.keys.select{ |a| force || additional_information.changes.keys.include?(a) }.each do |attr|
+          data["data[#{attr}]"] = additional_information[attr]
         end
 
         updated = false
@@ -722,7 +724,7 @@ module Osm
         # Finish off
         if updated
           reset_changed_attributes
-          custom.clean_up!
+          additional_information.clean_up!
         end
         return updated
       end

data/spec/osm/member_spec.rb

@@ -19,8 +19,8 @@ describe "Member" do
       :joined_movement => '2006-01-02',
       :started_section => '2006-01-07',
       :finished_section => '2007-12-31',
-      :custom => {'12_3' => '123'},
-      :custom_labels => {'12_3' => 'Label for 123'},
+      :additional_information => {'12_3' => '123'},
+      :additional_information_labels => {'12_3' => 'Label for 123'},
       :contact => Osm::Member::MemberContact.new(postcode: 'A'),
       :primary_contact => Osm::Member::PrimaryContact.new(postcode: 'B'),
       :secondary_contact => Osm::Member::PrimaryContact.new(postcode: 'C'),
@@ -43,8 +43,8 @@ describe "Member" do
     member.joined_movement.should == Date.new(2006, 1, 2)
     member.started_section.should == Date.new(2006, 1, 7)
     member.finished_section.should == Date.new(2007, 12, 31)
-    member.custom.should == {'12_3' => '123'}
-    member.custom_labels.should == {'12_3' => 'Label for 123'}
+    member.additional_information.should == {'12_3' => '123'}
+    member.additional_information_labels.should == {'12_3' => 'Label for 123'}
     member.contact.postcode.should == 'A'
     member.primary_contact.postcode.should == 'B'
     member.secondary_contact.postcode.should == 'C'
@@ -144,383 +144,386 @@ describe "Member" do
 
   describe "Using the API" do
 
-    it "Get from OSM" do
-      body = {
-        'status' => true,
-        'error' => nil,
-        'data' => {
-          '123' => {
-            'active' => true,
-            'age' => '12 / 00',
-            'date_of_birth' => '2000-03-08',
-            'end_date' => '2010-06-03',
-            'first_name' => 'John',
-            'joined' => '2008-07-12',
-            'last_name' => 'Smith',
-            'member_id' => 123,
-            'patrol' => 'Leaders',
-            'patrol_id' => -2,
-            'patrol_role_level' => 1,
-            'patrol_role_level_label' => 'Assistant leader',
-            'section_id' => 1,
-            'started' => '2006-07-17',
-            'custom_data' => {
-              '1' => {'2' => 'Primary', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'primary@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8441' => 'Data for 8441'},
-              '2' => {'2' => 'Secondary', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'secondary@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8442' => 'Data for 8442'},
-              '3' => {'2' => 'Emergency', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'emergency@example.com', '14' => '', '18' => '01234 567890', '20' => '0987 654321', '21' => '', '8443' => 'Data for 8443'},
-              '4' => {'2' => 'Doctor', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '18' => '01234 567890', '20' => '0987 654321', '21' => '', '54' => 'Surgery', '8444' => 'Data for 8444'},
-              '5' => {'4848' => 'Data for 4848'},
-              '6' => {'7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'member@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8446' => 'Data for 8446'},
-              '7' => {'34' => 'Unspecified'},
-            },
-          }
-        },
-        'meta' => {
-          'leader_count' => 20,
-          'member_count' => 30,
+    describe "Get from OSM" do
+
+      it "Normal data returned from OSM" do
+        body = {
           'status' => true,
-          'structure' => [
-            {'group_id' => 1, 'description' => '', 'identifier' => 'contact_primary_1', 'name' => 'Primary Contact 1', 'columns' => [
-              {'column_id' => 2, 'group_column_id' => '1_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 3, 'group_column_id' => '1_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 7, 'group_column_id' => '1_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8, 'group_column_id' => '1_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 9, 'group_column_id' => '1_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 10, 'group_column_id' => '1_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 11, 'group_column_id' => '1_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 12, 'group_column_id' => '1_12', 'label' => 'Email 1', 'varname' => 'email1', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
-              {'column_id' => 14, 'group_column_id' => '1_14', 'label' => 'Email 2', 'varname' => 'email2', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
-              {'column_id' => 18, 'group_column_id' => '1_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 20, 'group_column_id' => '1_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8441, 'group_column_id' => '1_8441', 'label' => 'Label for 8441', 'varname' => 'label_for_8441', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-            {'group_id' => 2, 'description' => '', 'identifier' => 'contact_primary_2', 'name' => 'Primary Contact 2', 'columns' => [
-              {'column_id' => 2, 'group_column_id' => '2_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 3, 'group_column_id' => '2_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 7, 'group_column_id' => '2_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8, 'group_column_id' => '2_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 9, 'group_column_id' => '2_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 10, 'group_column_id' => '2_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 11, 'group_column_id' => '2_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 12, 'group_column_id' => '2_12', 'label' => 'Email 1', 'varname' => 'email1', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
-              {'column_id' => 14, 'group_column_id' => '2_14', 'label' => 'Email 2', 'varname' => 'email2', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
-              {'column_id' => 18, 'group_column_id' => '2_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 20, 'group_column_id' => '2_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8442, 'group_column_id' => '2_8442', 'label' => 'Label for 8442', 'varname' => 'label_for_8442', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-            {'group_id' => 3, 'description' => '', 'identifier' => 'emergency', 'name' => 'Emergency Contact', 'columns' => [
-              {'column_id' => 2, 'group_column_id' => '3_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 3, 'group_column_id' => '3_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 7, 'group_column_id' => '3_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8, 'group_column_id' => '3_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 9, 'group_column_id' => '3_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 10, 'group_column_id' => '3_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 11, 'group_column_id' => '3_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 12, 'group_column_id' => '3_12', 'label' => 'Email 1', 'varname' => 'email1', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
-              {'column_id' => 14, 'group_column_id' => '3_14', 'label' => 'Email 2', 'varname' => 'email2', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
-              {'column_id' => 18, 'group_column_id' => '3_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 20, 'group_column_id' => '3_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8443, 'group_column_id' => '3_8443', 'label' => 'Label for 8443', 'varname' => 'label_for_8443', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-            {'group_id' => 4, 'description' => '', 'identifier' => 'doctor', 'name' => "Doctor's Surgery", 'columns' => [
-              {'column_id' => 2, 'group_column_id' => '4_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 3, 'group_column_id' => '4_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 54, 'group_column_id' => '4_54', 'label' => 'Surgery', 'varname' => 'surgery', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 7, 'group_column_id' => '4_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8, 'group_column_id' => '4_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 9, 'group_column_id' => '4_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 10, 'group_column_id' => '4_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 11, 'group_column_id' => '4_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 18, 'group_column_id' => '4_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 20, 'group_column_id' => '4_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8444, 'group_column_id' => '4_8444', 'label' => 'Label for 8444', 'varname' => 'label_for_8444', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-            {'group_id' => 6, 'description' => '', 'identifier' => 'contact_member', 'name' => 'Member', 'columns' => [
-              {'column_id' => 2, 'group_column_id' => '6_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 3, 'group_column_id' => '6_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 7, 'group_column_id' => '6_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8, 'group_column_id' => '6_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 9, 'group_column_id' => '6_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 10, 'group_column_id' => '6_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 11, 'group_column_id' => '6_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 12, 'group_column_id' => '6_12', 'label' => 'Email 1', 'varname' => 'email1', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
-              {'column_id' => 14, 'group_column_id' => '6_14', 'label' => 'Email 2', 'varname' => 'email2', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
-              {'column_id' => 18, 'group_column_id' => '6_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 20, 'group_column_id' => '6_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-              {'column_id' => 8446, 'group_column_id' => '6_8446', 'label' => 'Label for 8446', 'varname' => 'label_for_8446', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-            {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
-              {'column_id' => 4848, 'group_column_id' => '5_4848', 'label' => 'Label for 4848', 'varname' => 'label_for_4848', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-            {'group_id' => 7, 'description' => '', 'identifier' => 'floating', 'name' => 'Floating', 'columns' => [
-              {'column_id' => 34, 'group_column_id' => '7_34', 'label' => 'Gender', 'varname' => 'gender', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-          ],
-        },
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
-
-      members = Osm::Member.get_for_section(@api, 1, 2)
-      members.size.should == 1
-      member = members[0]
-      member.id.should == 123
-      member.section_id.should == 1
-      member.first_name.should == 'John'
-      member.last_name.should == 'Smith'
-      member.date_of_birth.should == Date.new(2000, 3, 8)
-      member.grouping_id.should == -2
-      member.grouping_leader.should == 1
-      member.grouping_label.should == 'Leaders'
-      member.grouping_leader_label.should == 'Assistant leader'
-      member.age.should == '12 / 00'
-      member.gender.should == :unspecified
-      member.joined_movement.should == Date.new(2006, 7, 17)
-      member.started_section.should == Date.new(2008, 7, 12)
-      member.finished_section.should == Date.new(2010, 6, 3)
-      member.custom.should == {"label_for_4848" => "Data for 4848"}
-      member.custom_labels.should == {"label_for_4848" => 'Label for 4848'}
-      member.contact.first_name.should == 'John'
-      member.contact.last_name.should == 'Smith'
-      member.contact.address_1.should == 'Address 1'
-      member.contact.address_2.should == 'Address 2'
-      member.contact.address_3.should == 'Address 3'
-      member.contact.address_4.should == 'Address 4'
-      member.contact.postcode.should == 'Postcode'
-      member.contact.phone_1.should == '01234 567890'
-      member.contact.receive_phone_1.should == true
-      member.contact.phone_2.should == '0987 654321'
-      member.contact.receive_phone_2.should == false
-      member.contact.email_1.should == 'member@example.com'
-      member.contact.receive_email_1.should == true
-      member.contact.email_2.should == ''
-      member.contact.receive_email_2.should == false
-      member.contact.custom.should == {"label_for_8446"=>"Data for 8446"}
-      member.contact.custom_labels.should == {"label_for_8446"=>"Label for 8446"}
-      member.primary_contact.first_name.should == 'Primary'
-      member.primary_contact.last_name.should == 'Contact'
-      member.primary_contact.address_1.should == 'Address 1'
-      member.primary_contact.address_2.should == 'Address 2'
-      member.primary_contact.address_3.should == 'Address 3'
-      member.primary_contact.address_4.should == 'Address 4'
-      member.primary_contact.postcode.should == 'Postcode'
-      member.primary_contact.phone_1.should == '01234 567890'
-      member.primary_contact.receive_phone_1.should == true
-      member.primary_contact.phone_2.should == '0987 654321'
-      member.primary_contact.receive_phone_2.should == false
-      member.primary_contact.email_1.should == 'primary@example.com'
-      member.primary_contact.receive_email_1.should == true
-      member.primary_contact.email_2.should == ''
-      member.primary_contact.receive_email_2.should == false
-      member.primary_contact.custom.should == {"label_for_8441"=>"Data for 8441"}
-      member.primary_contact.custom_labels.should == {"label_for_8441"=>"Label for 8441"}
-      member.secondary_contact.first_name.should == 'Secondary'
-      member.secondary_contact.last_name.should == 'Contact'
-      member.secondary_contact.address_1.should == 'Address 1'
-      member.secondary_contact.address_2.should == 'Address 2'
-      member.secondary_contact.address_3.should == 'Address 3'
-      member.secondary_contact.address_4.should == 'Address 4'
-      member.secondary_contact.postcode.should == 'Postcode'
-      member.secondary_contact.phone_1.should == '01234 567890'
-      member.secondary_contact.receive_phone_1.should == true
-      member.secondary_contact.phone_2.should == '0987 654321'
-      member.secondary_contact.receive_phone_2.should == false
-      member.secondary_contact.email_1.should == 'secondary@example.com'
-      member.secondary_contact.receive_email_1.should == true
-      member.secondary_contact.email_2.should == ''
-      member.secondary_contact.receive_email_2.should == false
-      member.secondary_contact.custom.should == {"label_for_8442"=>"Data for 8442"}
-      member.secondary_contact.custom_labels.should == {"label_for_8442"=>"Label for 8442"}
-      member.emergency_contact.first_name.should == 'Emergency'
-      member.emergency_contact.last_name.should == 'Contact'
-      member.emergency_contact.address_1.should == 'Address 1'
-      member.emergency_contact.address_2.should == 'Address 2'
-      member.emergency_contact.address_3.should == 'Address 3'
-      member.emergency_contact.address_4.should == 'Address 4'
-      member.emergency_contact.postcode.should == 'Postcode'
-      member.emergency_contact.phone_1.should == '01234 567890'
-      member.emergency_contact.phone_2.should == '0987 654321'
-      member.emergency_contact.email_1.should == 'emergency@example.com'
-      member.emergency_contact.email_2.should == ''
-      member.emergency_contact.custom.should == {"label_for_8443"=>"Data for 8443"}
-      member.emergency_contact.custom_labels.should == {"label_for_8443"=>"Label for 8443"}
-      member.doctor.first_name.should == 'Doctor'
-      member.doctor.last_name.should == 'Contact'
-      member.doctor.surgery.should == 'Surgery'
-      member.doctor.address_1.should == 'Address 1'
-      member.doctor.address_2.should == 'Address 2'
-      member.doctor.address_3.should == 'Address 3'
-      member.doctor.address_4.should == 'Address 4'
-      member.doctor.postcode.should == 'Postcode'
-      member.doctor.phone_1.should == '01234 567890'
-      member.doctor.phone_2.should == '0987 654321'
-      member.doctor.custom.should == {"label_for_8444"=>"Data for 8444"}
-      member.doctor.custom_labels.should == {"label_for_8444"=>"Label for 8444"}
-      member.valid?.should == true
-    end
+          'error' => nil,
+          'data' => {
+            '123' => {
+              'active' => true,
+              'age' => '12 / 00',
+              'date_of_birth' => '2000-03-08',
+              'end_date' => '2010-06-03',
+              'first_name' => 'John',
+              'joined' => '2008-07-12',
+              'last_name' => 'Smith',
+              'member_id' => 123,
+              'patrol' => 'Leaders',
+              'patrol_id' => -2,
+              'patrol_role_level' => 1,
+              'patrol_role_level_label' => 'Assistant leader',
+              'section_id' => 1,
+              'started' => '2006-07-17',
+              'custom_data' => {
+                '1' => {'2' => 'Primary', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'primary@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8441' => 'Data for 8441'},
+                '2' => {'2' => 'Secondary', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'secondary@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8442' => 'Data for 8442'},
+                '3' => {'2' => 'Emergency', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'emergency@example.com', '14' => '', '18' => '01234 567890', '20' => '0987 654321', '21' => '', '8443' => 'Data for 8443'},
+                '4' => {'2' => 'Doctor', '3' => 'Contact', '7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '18' => '01234 567890', '20' => '0987 654321', '21' => '', '54' => 'Surgery', '8444' => 'Data for 8444'},
+                '5' => {'4848' => 'Data for 4848'},
+                '6' => {'7' => 'Address 1', '8' => 'Address 2', '9' => 'Address 3', '10' => 'Address 4', '11' => 'Postcode', '12' => 'member@example.com', '13' => 'yes', '14' => '', '15' => '', '18' => '01234 567890', '19' => 'yes', '20' => '0987 654321', '21' => '', '8446' => 'Data for 8446'},
+                '7' => {'34' => 'Unspecified'},
+              },
+            }
+          },
+          'meta' => {
+            'leader_count' => 20,
+            'member_count' => 30,
+            'status' => true,
+            'structure' => [
+              {'group_id' => 1, 'description' => '', 'identifier' => 'contact_primary_1', 'name' => 'Primary Contact 1', 'columns' => [
+                {'column_id' => 2, 'group_column_id' => '1_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 3, 'group_column_id' => '1_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 7, 'group_column_id' => '1_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8, 'group_column_id' => '1_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 9, 'group_column_id' => '1_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 10, 'group_column_id' => '1_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 11, 'group_column_id' => '1_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 12, 'group_column_id' => '1_12', 'label' => 'Email 1', 'varname' => 'email1', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
+                {'column_id' => 14, 'group_column_id' => '1_14', 'label' => 'Email 2', 'varname' => 'email2', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
+                {'column_id' => 18, 'group_column_id' => '1_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 20, 'group_column_id' => '1_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8441, 'group_column_id' => '1_8441', 'label' => 'Label for 8441', 'varname' => 'label_for_8441', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+              {'group_id' => 2, 'description' => '', 'identifier' => 'contact_primary_2', 'name' => 'Primary Contact 2', 'columns' => [
+                {'column_id' => 2, 'group_column_id' => '2_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 3, 'group_column_id' => '2_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 7, 'group_column_id' => '2_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8, 'group_column_id' => '2_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 9, 'group_column_id' => '2_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 10, 'group_column_id' => '2_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 11, 'group_column_id' => '2_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 12, 'group_column_id' => '2_12', 'label' => 'Email 1', 'varname' => 'email1', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
+                {'column_id' => 14, 'group_column_id' => '2_14', 'label' => 'Email 2', 'varname' => 'email2', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
+                {'column_id' => 18, 'group_column_id' => '2_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 20, 'group_column_id' => '2_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8442, 'group_column_id' => '2_8442', 'label' => 'Label for 8442', 'varname' => 'label_for_8442', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+              {'group_id' => 3, 'description' => '', 'identifier' => 'emergency', 'name' => 'Emergency Contact', 'columns' => [
+                {'column_id' => 2, 'group_column_id' => '3_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 3, 'group_column_id' => '3_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 7, 'group_column_id' => '3_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8, 'group_column_id' => '3_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 9, 'group_column_id' => '3_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 10, 'group_column_id' => '3_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 11, 'group_column_id' => '3_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 12, 'group_column_id' => '3_12', 'label' => 'Email 1', 'varname' => 'email1', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
+                {'column_id' => 14, 'group_column_id' => '3_14', 'label' => 'Email 2', 'varname' => 'email2', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
+                {'column_id' => 18, 'group_column_id' => '3_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 20, 'group_column_id' => '3_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8443, 'group_column_id' => '3_8443', 'label' => 'Label for 8443', 'varname' => 'label_for_8443', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+              {'group_id' => 4, 'description' => '', 'identifier' => 'doctor', 'name' => "Doctor's Surgery", 'columns' => [
+                {'column_id' => 2, 'group_column_id' => '4_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 3, 'group_column_id' => '4_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 54, 'group_column_id' => '4_54', 'label' => 'Surgery', 'varname' => 'surgery', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 7, 'group_column_id' => '4_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8, 'group_column_id' => '4_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 9, 'group_column_id' => '4_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 10, 'group_column_id' => '4_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 11, 'group_column_id' => '4_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 18, 'group_column_id' => '4_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 20, 'group_column_id' => '4_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8444, 'group_column_id' => '4_8444', 'label' => 'Label for 8444', 'varname' => 'label_for_8444', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+              {'group_id' => 6, 'description' => '', 'identifier' => 'contact_member', 'name' => 'Member', 'columns' => [
+                {'column_id' => 2, 'group_column_id' => '6_2', 'label' => 'First Name', 'varname' => 'firstname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 3, 'group_column_id' => '6_3', 'label' => 'Last Name', 'varname' => 'lastname', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 7, 'group_column_id' => '6_7', 'label' => 'Address 1', 'varname' => 'address1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8, 'group_column_id' => '6_8', 'label' => 'Address 2', 'varname' => 'address2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 9, 'group_column_id' => '6_9', 'label' => 'Address 3', 'varname' => 'address3', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 10, 'group_column_id' => '6_10', 'label' => 'Address 4', 'varname' => 'address4', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 11, 'group_column_id' => '6_11', 'label' => 'Postcode', 'varname' => 'postcode', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 12, 'group_column_id' => '6_12', 'label' => 'Email 1', 'varname' => 'email1', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
+                {'column_id' => 14, 'group_column_id' => '6_14', 'label' => 'Email 2', 'varname' => 'email2', 'read_only' => 'no', 'required' => 'no', 'type' => 'email', 'width' => 120},
+                {'column_id' => 18, 'group_column_id' => '6_18', 'label' => 'Phone 1', 'varname' => 'phone1', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 20, 'group_column_id' => '6_20', 'label' => 'Phone 2', 'varname' => 'phone2', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+                {'column_id' => 8446, 'group_column_id' => '6_8446', 'label' => 'Label for 8446', 'varname' => 'label_for_8446', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+              {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
+                {'column_id' => 4848, 'group_column_id' => '5_4848', 'label' => 'Label for 4848', 'varname' => 'label_for_4848', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+              {'group_id' => 7, 'description' => '', 'identifier' => 'floating', 'name' => 'Floating', 'columns' => [
+                {'column_id' => 34, 'group_column_id' => '7_34', 'label' => 'Gender', 'varname' => 'gender', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+            ],
+          },
+        }
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
+
+        members = Osm::Member.get_for_section(@api, 1, 2)
+        members.size.should == 1
+        member = members[0]
+        member.id.should == 123
+        member.section_id.should == 1
+        member.first_name.should == 'John'
+        member.last_name.should == 'Smith'
+        member.date_of_birth.should == Date.new(2000, 3, 8)
+        member.grouping_id.should == -2
+        member.grouping_leader.should == 1
+        member.grouping_label.should == 'Leaders'
+        member.grouping_leader_label.should == 'Assistant leader'
+        member.age.should == '12 / 00'
+        member.gender.should == :unspecified
+        member.joined_movement.should == Date.new(2006, 7, 17)
+        member.started_section.should == Date.new(2008, 7, 12)
+        member.finished_section.should == Date.new(2010, 6, 3)
+        member.additional_information.should == {"label_for_4848" => "Data for 4848"}
+        member.additional_information_labels.should == {"label_for_4848" => 'Label for 4848'}
+        member.contact.first_name.should == 'John'
+        member.contact.last_name.should == 'Smith'
+        member.contact.address_1.should == 'Address 1'
+        member.contact.address_2.should == 'Address 2'
+        member.contact.address_3.should == 'Address 3'
+        member.contact.address_4.should == 'Address 4'
+        member.contact.postcode.should == 'Postcode'
+        member.contact.phone_1.should == '01234 567890'
+        member.contact.receive_phone_1.should == true
+        member.contact.phone_2.should == '0987 654321'
+        member.contact.receive_phone_2.should == false
+        member.contact.email_1.should == 'member@example.com'
+        member.contact.receive_email_1.should == true
+        member.contact.email_2.should == ''
+        member.contact.receive_email_2.should == false
+        member.contact.additional_information.should == {"label_for_8446"=>"Data for 8446"}
+        member.contact.additional_information_labels.should == {"label_for_8446"=>"Label for 8446"}
+        member.primary_contact.first_name.should == 'Primary'
+        member.primary_contact.last_name.should == 'Contact'
+        member.primary_contact.address_1.should == 'Address 1'
+        member.primary_contact.address_2.should == 'Address 2'
+        member.primary_contact.address_3.should == 'Address 3'
+        member.primary_contact.address_4.should == 'Address 4'
+        member.primary_contact.postcode.should == 'Postcode'
+        member.primary_contact.phone_1.should == '01234 567890'
+        member.primary_contact.receive_phone_1.should == true
+        member.primary_contact.phone_2.should == '0987 654321'
+        member.primary_contact.receive_phone_2.should == false
+        member.primary_contact.email_1.should == 'primary@example.com'
+        member.primary_contact.receive_email_1.should == true
+        member.primary_contact.email_2.should == ''
+        member.primary_contact.receive_email_2.should == false
+        member.primary_contact.additional_information.should == {"label_for_8441"=>"Data for 8441"}
+        member.primary_contact.additional_information_labels.should == {"label_for_8441"=>"Label for 8441"}
+        member.secondary_contact.first_name.should == 'Secondary'
+        member.secondary_contact.last_name.should == 'Contact'
+        member.secondary_contact.address_1.should == 'Address 1'
+        member.secondary_contact.address_2.should == 'Address 2'
+        member.secondary_contact.address_3.should == 'Address 3'
+        member.secondary_contact.address_4.should == 'Address 4'
+        member.secondary_contact.postcode.should == 'Postcode'
+        member.secondary_contact.phone_1.should == '01234 567890'
+        member.secondary_contact.receive_phone_1.should == true
+        member.secondary_contact.phone_2.should == '0987 654321'
+        member.secondary_contact.receive_phone_2.should == false
+        member.secondary_contact.email_1.should == 'secondary@example.com'
+        member.secondary_contact.receive_email_1.should == true
+        member.secondary_contact.email_2.should == ''
+        member.secondary_contact.receive_email_2.should == false
+        member.secondary_contact.additional_information.should == {"label_for_8442"=>"Data for 8442"}
+        member.secondary_contact.additional_information_labels.should == {"label_for_8442"=>"Label for 8442"}
+        member.emergency_contact.first_name.should == 'Emergency'
+        member.emergency_contact.last_name.should == 'Contact'
+        member.emergency_contact.address_1.should == 'Address 1'
+        member.emergency_contact.address_2.should == 'Address 2'
+        member.emergency_contact.address_3.should == 'Address 3'
+        member.emergency_contact.address_4.should == 'Address 4'
+        member.emergency_contact.postcode.should == 'Postcode'
+        member.emergency_contact.phone_1.should == '01234 567890'
+        member.emergency_contact.phone_2.should == '0987 654321'
+        member.emergency_contact.email_1.should == 'emergency@example.com'
+        member.emergency_contact.email_2.should == ''
+        member.emergency_contact.additional_information.should == {"label_for_8443"=>"Data for 8443"}
+        member.emergency_contact.additional_information_labels.should == {"label_for_8443"=>"Label for 8443"}
+        member.doctor.first_name.should == 'Doctor'
+        member.doctor.last_name.should == 'Contact'
+        member.doctor.surgery.should == 'Surgery'
+        member.doctor.address_1.should == 'Address 1'
+        member.doctor.address_2.should == 'Address 2'
+        member.doctor.address_3.should == 'Address 3'
+        member.doctor.address_4.should == 'Address 4'
+        member.doctor.postcode.should == 'Postcode'
+        member.doctor.phone_1.should == '01234 567890'
+        member.doctor.phone_2.should == '0987 654321'
+        member.doctor.additional_information.should == {"label_for_8444"=>"Data for 8444"}
+        member.doctor.additional_information_labels.should == {"label_for_8444"=>"Label for 8444"}
+        member.valid?.should == true
+      end
 
-    it "Get from OSM (handles disabled contacts)" do
-      body = {
-        'status' => true,
-        'error' => nil,
-        'data' => {
-          '123' => {
-            'active' => true,
-            'age' => '12 / 00',
-            'date_of_birth' => '2000-03-08',
-            'end_date' => '2010-06-03',
-            'first_name' => 'John',
-            'joined' => '2008-07-12',
-            'last_name' => 'Smith',
-            'member_id' => 123,
-            'patrol' => 'Leaders',
-            'patrol_id' => -2,
-            'patrol_role_level' => 1,
-            'patrol_role_level_label' => 'Assistant leader',
-            'section_id' => 1,
-            'started' => '2006-07-17',
-            'custom_data' => {
-              '5' => {'4848' => 'Data for 4848'},
-              '7' => {'34' => 'Unspecified'},
-            },
-          }
-        },
-        'meta' => {
-          'leader_count' => 20,
-          'member_count' => 30,
+      it "Handles disabled contacts" do
+        body = {
           'status' => true,
-          'structure' => [
-            {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
-              {'column_id' => 4848, 'group_column_id' => '5_4848', 'label' => 'Label for 4848', 'varname' => 'label_for_4848', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-            {'group_id' => 7, 'description' => '', 'identifier' => 'floating', 'name' => 'Floating', 'columns' => [
-              {'column_id' => 34, 'group_column_id' => '7_34', 'label' => 'Gender', 'varname' => 'gender', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-          ],
-        },
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
-
-      members = Osm::Member.get_for_section(@api, 1, 2)
-      members.size.should == 1
-      member = members[0]
-      member.id.should == 123
-      member.contact.should == nil
-      member.primary_contact.should == nil
-      member.secondary_contact.should == nil
-      member.emergency_contact.should == nil
-      member.doctor.should == nil
-      member.valid?.should == true
-    end
+          'error' => nil,
+          'data' => {
+            '123' => {
+              'active' => true,
+              'age' => '12 / 00',
+              'date_of_birth' => '2000-03-08',
+              'end_date' => '2010-06-03',
+              'first_name' => 'John',
+              'joined' => '2008-07-12',
+              'last_name' => 'Smith',
+              'member_id' => 123,
+              'patrol' => 'Leaders',
+              'patrol_id' => -2,
+              'patrol_role_level' => 1,
+              'patrol_role_level_label' => 'Assistant leader',
+              'section_id' => 1,
+              'started' => '2006-07-17',
+              'custom_data' => {
+                '5' => {'4848' => 'Data for 4848'},
+                '7' => {'34' => 'Unspecified'},
+              },
+            }
+          },
+          'meta' => {
+            'leader_count' => 20,
+            'member_count' => 30,
+            'status' => true,
+            'structure' => [
+              {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
+                {'column_id' => 4848, 'group_column_id' => '5_4848', 'label' => 'Label for 4848', 'varname' => 'label_for_4848', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+              {'group_id' => 7, 'description' => '', 'identifier' => 'floating', 'name' => 'Floating', 'columns' => [
+                {'column_id' => 34, 'group_column_id' => '7_34', 'label' => 'Gender', 'varname' => 'gender', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+            ],
+          },
+        }
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
+
+        members = Osm::Member.get_for_section(@api, 1, 2)
+        members.size.should == 1
+        member = members[0]
+        member.id.should == 123
+        member.contact.should == nil
+        member.primary_contact.should == nil
+        member.secondary_contact.should == nil
+        member.emergency_contact.should == nil
+        member.doctor.should == nil
+        member.valid?.should == true
+      end
 
-    it "Get from OSM (handles no custom data)" do
-      body = {
-        'status' => true,
-        'error' => nil,
-        'data' => {
-          '123' => {
-            'active' => true,
-            'age' => '12 / 00',
-            'date_of_birth' => '2000-03-08',
-            'end_date' => '2010-06-03',
-            'first_name' => 'John',
-            'joined' => '2008-07-12',
-            'last_name' => 'Smith',
-            'member_id' => 123,
-            'patrol' => 'Leaders',
-            'patrol_id' => -2,
-            'patrol_role_level' => 1,
-            'patrol_role_level_label' => 'Assistant leader',
-            'section_id' => 1,
-            'started' => '2006-07-17',
-            'custom_data' => {
-              '7' => {'34' => 'Unspecified'},
-            },
-          }
-        },
-        'meta' => {
-          'leader_count' => 20,
-          'member_count' => 30,
+      it "Handles no custom data" do
+        body = {
           'status' => true,
-          'structure' => [
-            {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
-              {'column_id' => 4848, 'group_column_id' => '5_4848', 'label' => 'Label for 4848', 'varname' => 'label_for_4848', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-            {'group_id' => 7, 'description' => '', 'identifier' => 'floating', 'name' => 'Floating', 'columns' => [
-              {'column_id' => 34, 'group_column_id' => '7_34', 'label' => 'Gender', 'varname' => 'gender', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-          ],
-        },
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
-
-      members = Osm::Member.get_for_section(@api, 1, 2)
-      members.size.should == 1
-      member = members[0]
-      member.id.should == 123
-      member.custom.should == {}
-      member.valid?.should == true
-    end
+          'error' => nil,
+          'data' => {
+            '123' => {
+              'active' => true,
+              'age' => '12 / 00',
+              'date_of_birth' => '2000-03-08',
+              'end_date' => '2010-06-03',
+              'first_name' => 'John',
+              'joined' => '2008-07-12',
+              'last_name' => 'Smith',
+              'member_id' => 123,
+              'patrol' => 'Leaders',
+              'patrol_id' => -2,
+              'patrol_role_level' => 1,
+              'patrol_role_level_label' => 'Assistant leader',
+              'section_id' => 1,
+              'started' => '2006-07-17',
+              'custom_data' => {
+                '7' => {'34' => 'Unspecified'},
+              },
+            }
+          },
+          'meta' => {
+            'leader_count' => 20,
+            'member_count' => 30,
+            'status' => true,
+            'structure' => [
+              {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
+                {'column_id' => 4848, 'group_column_id' => '5_4848', 'label' => 'Label for 4848', 'varname' => 'label_for_4848', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+              {'group_id' => 7, 'description' => '', 'identifier' => 'floating', 'name' => 'Floating', 'columns' => [
+                {'column_id' => 34, 'group_column_id' => '7_34', 'label' => 'Gender', 'varname' => 'gender', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+            ],
+          },
+        }
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
+
+        members = Osm::Member.get_for_section(@api, 1, 2)
+        members.size.should == 1
+        member = members[0]
+        member.id.should == 123
+        member.additional_information.should == {}
+        member.valid?.should == true
+      end
 
-    it "Get from OSM (handles missing floating data)" do
-      body = {
-        'status' => true,
-        'error' => nil,
-        'data' => {
-          '123' => {
-            'active' => true,
-            'age' => '12 / 00',
-            'date_of_birth' => '2000-03-08',
-            'end_date' => '2010-06-03',
-            'first_name' => 'John',
-            'joined' => '2008-07-12',
-            'last_name' => 'Smith',
-            'member_id' => 123,
-            'patrol' => 'Leaders',
-            'patrol_id' => -2,
-            'patrol_role_level' => 1,
-            'patrol_role_level_label' => 'Assistant leader',
-            'section_id' => 1,
-            'started' => '2006-07-17',
-            'custom_data' => {
-              '5' => {'4848' => 'Data for 4848'},
-            },
-          }
-        },
-        'meta' => {
-          'leader_count' => 20,
-          'member_count' => 30,
+      it "Handles missing floating data" do
+        body = {
           'status' => true,
-          'structure' => [
-            {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
-              {'column_id' => 4848, 'group_column_id' => '5_4848', 'label' => 'Label for 4848', 'varname' => 'label_for_4848', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-            {'group_id' => 7, 'description' => '', 'identifier' => 'floating', 'name' => 'Floating', 'columns' => [
-              {'column_id' => 34, 'group_column_id' => '7_34', 'label' => 'Gender', 'varname' => 'gender', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
-            ]},
-          ],
-        },
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
-
-      members = Osm::Member.get_for_section(@api, 1, 2)
-      members.size.should == 1
-      member = members[0]
-      member.id.should == 123
-      member.gender.should == nil
-      member.valid?.should == true
-    end
+          'error' => nil,
+          'data' => {
+            '123' => {
+              'active' => true,
+              'age' => '12 / 00',
+              'date_of_birth' => '2000-03-08',
+              'end_date' => '2010-06-03',
+              'first_name' => 'John',
+              'joined' => '2008-07-12',
+              'last_name' => 'Smith',
+              'member_id' => 123,
+              'patrol' => 'Leaders',
+              'patrol_id' => -2,
+              'patrol_role_level' => 1,
+              'patrol_role_level_label' => 'Assistant leader',
+              'section_id' => 1,
+              'started' => '2006-07-17',
+              'custom_data' => {
+                '5' => {'4848' => 'Data for 4848'},
+              },
+            }
+          },
+          'meta' => {
+            'leader_count' => 20,
+            'member_count' => 30,
+            'status' => true,
+            'structure' => [
+              {'group_id' => 5, 'description' => 'This allows you to add  extra information for your members.', 'identifier' => 'customisable_data', 'name' => 'Customisable Data', 'columns' => [
+                {'column_id' => 4848, 'group_column_id' => '5_4848', 'label' => 'Label for 4848', 'varname' => 'label_for_4848', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+              {'group_id' => 7, 'description' => '', 'identifier' => 'floating', 'name' => 'Floating', 'columns' => [
+                {'column_id' => 34, 'group_column_id' => '7_34', 'label' => 'Gender', 'varname' => 'gender', 'read_only' => 'no', 'required' => 'no', 'type' => 'text', 'width' => 120},
+              ]},
+            ],
+          },
+        }
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
+
+        members = Osm::Member.get_for_section(@api, 1, 2)
+        members.size.should == 1
+        member = members[0]
+        member.id.should == 123
+        member.gender.should == nil
+        member.valid?.should == true
+      end
 
+      it "Handles an empty data array" do
+        body = {
+          'status' => true,
+          'error' => nil,
+          'data' => [],
+          'meta' => {},
+        }
+        FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
 
-    it "Get from OSM (handles an empty data array)" do
-      body = {
-        'status' => true,
-        'error' => nil,
-        'data' => [],
-        'meta' => {},
-      }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/members/contact/grid/?action=getMembers", :body => body.to_json, :content_type => 'application/json')
+        Osm::Member.get_for_section(@api, 1, 2).should == []
+      end
 
-      Osm::Member.get_for_section(@api, 1, 2).should == []
     end
 
 
@@ -541,8 +544,8 @@ describe "Member" do
           :joined_movement => '2006-01-02',
           :started_section => '2006-01-07',
           :finished_section => '2007-12-31',
-          :custom => {'12_3' => '123'},
-          :custom_labels => {'12_3' => 'Label for 123'},
+          :additional_information => {'12_3' => '123'},
+          :additional_information_labels => {'12_3' => 'Label for 123'},
           :contact => Osm::Member::MemberContact.new(postcode: 'A'),
           :primary_contact => Osm::Member::PrimaryContact.new(postcode: 'B'),
           :secondary_contact => Osm::Member::PrimaryContact.new(postcode: 'C'),
@@ -628,13 +631,13 @@ describe "Member" do
           :joined_movement => '2006-01-02',
           :started_section => '2006-01-07',
           :finished_section => '2007-12-31',
-          :custom => DirtyHashy[ '12_3' => '123' ],
-          :custom_labels => {'12_3' => 'Label for 123'},
+          :additional_information => DirtyHashy[ '12_3', '123' ],
+          :additional_information_labels => {'12_3' => 'Label for 123'},
           :contact => Osm::Member::MemberContact.new(postcode: 'A'),
           :primary_contact => Osm::Member::PrimaryContact.new(postcode: 'B'),
           :secondary_contact => Osm::Member::SecondaryContact.new(postcode: 'C'),
           :emergency_contact => Osm::Member::EmergencyContact.new(postcode: 'D'),
-          :doctor => Osm::Member::DoctorContact.new(postcode: 'E'),
+          :doctor => Osm::Member::DoctorContact.new(postcode: 'E', additional_information: DirtyHashy['test_var', 'This is a test']),
         }
         @member = Osm::Member.new(attributes)
       end
@@ -722,17 +725,33 @@ describe "Member" do
           "associated_id" => 1,
           "group_id" => 4,
           "data[surgery]" => "Surgery",
+          "data[test_var]" => "This is still a test",
         }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"status":true}'}) }
 
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/customdata/?action=updateColumn&section_id=2', {:body => {
+          "apiid" => "1",
+          "token" => "API TOKEN",
+          "userid" => "user_id",
+          "secret" => "secret",
+          "context" => "members",
+          "associated_type" => "member",
+          "associated_id" => 1,
+          "group_id" => 5,
+          "column_id" => "12_3",
+          "value" => "321",
+        }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"data":{"value":"321"}}'}) }
+
         Osm::Term.stub(:get_for_section) { [] }
 
         @member.first_name = 'John'
         @member.gender = :unspecified
+        @member.additional_information['12_3'] = '321'
         @member.contact.address_1 = 'Address 1'
         @member.primary_contact.address_2 = 'Address 2'
         @member.secondary_contact.address_3 = 'Address 3'
         @member.emergency_contact.address_4 = 'Address 4'
         @member.doctor.surgery = 'Surgery'
+        @member.doctor.additional_information['test_var'] = 'This is still a test'
         @member.update(@api).should == true
       end
 
@@ -845,6 +864,7 @@ describe "Member" do
           "data[postcode]" => "E",
           "data[phone1]" => nil,
           "data[phone2]" => nil,
+          "data[test_var]" => "This is a test",
         }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"status":true}'}) }
 
         Osm::Term.stub(:get_for_section) { [] }
@@ -862,6 +882,16 @@ describe "Member" do
         expect{ Osm::Member.new.create(@api) }.to raise_error(Osm::ObjectIsInvalid, 'member is invalid')
       end
 
+      it "Handles disabled contacts" do
+        @member.contact = nil
+        @member.primary_contact = nil
+        @member.secondary_contact = nil
+        @member.emergency_contact = nil
+        @member.doctor = nil
+        HTTParty.stub(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+        @member.update(@api).should == true
+      end
+
     end
 
     it "Get Photo link" do
@@ -877,8 +907,8 @@ describe "Member" do
         :grouping_leader => 0,
         :grouping_label => 'Grouping',
         :grouping_leader_label => '',
-        :custom => {},
-        :custom_labels => {},
+        :additional_information => {},
+        :additional_information_labels => {},
         :contact => Osm::Member::MemberContact.new(),
         :primary_contact => Osm::Member::PrimaryContact.new(),
         :secondary_contact => Osm::Member::PrimaryContact.new(),
@@ -906,8 +936,8 @@ describe "Member" do
           :grouping_leader => 0,
           :grouping_label => 'Grouping',
           :grouping_leader_label => '',
-          :custom => {},
-          :custom_labels => {},
+          :additional_information => {},
+          :additional_information_labels => {},
           :contact => Osm::Member::MemberContact.new(),
           :primary_contact => Osm::Member::PrimaryContact.new(),
           :secondary_contact => Osm::Member::PrimaryContact.new(),