diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
index 692e102..79b7702 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
@@ -9,13 +9,13 @@ dependencies:
     - field.field.oc_actor.client.field_disability
     - field.field.oc_actor.client.field_ethnic_o
     - field.field.oc_actor.client.field_gender_identified_with
-    - field.field.oc_actor.client.field_general_noes
     - field.field.oc_actor.client.field_how_heard
     - field.field.oc_actor.client.field_income
     - field.field.oc_actor.client.field_languages_spoken
     - field.field.oc_actor.client.field_marital_
     - field.field.oc_actor.client.field_nationalities
     - field.field.oc_actor.client.field_referred_by
+    - field.field.oc_actor.client.field_sex
     - opencase_entities.oc_actor_type.client
   module:
     - datetime
@@ -26,7 +26,7 @@ bundle: client
 mode: default
 content:
   field_asylum_status:
-    weight: 6
+    weight: 4
     settings: {  }
     third_party_settings: {  }
     type: options_select
@@ -40,27 +40,19 @@ content:
     type: string_textfield
     region: content
   field_confidentiality_form:
-    weight: 15
+    weight: 13
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
     type: file_generic
     region: content
   field_date_of_birth:
-    weight: 3
+    weight: 0
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_dependants:
-    weight: 12
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_disability:
     weight: 10
     settings:
       size: 60
@@ -68,8 +60,16 @@ content:
     third_party_settings: {  }
     type: string_textfield
     region: content
+  field_disability:
+    weight: 8
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textfield
+    region: content
   field_ethnic_o:
-    weight: 7
+    weight: 5
     settings:
       size: 60
       placeholder: ''
@@ -77,57 +77,55 @@ content:
     type: string_textfield
     region: content
   field_gender_identified_with:
-    weight: 4
+    weight: 1
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
-  field_general_noes:
-    weight: 27
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_how_heard:
-    weight: 13
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_income:
     weight: 11
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
-  field_languages_spoken:
+  field_income:
     weight: 9
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
+  field_languages_spoken:
+    weight: 7
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
   field_marital_:
-    weight: 5
+    weight: 3
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_nationalities:
-    weight: 8
+    type: options_select
+    weight: 6
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_select
-    region: content
   field_referred_by:
-    weight: 14
+    weight: 12
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
     type: string_textfield
     region: content
+  field_sex:
+    weight: 2
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
   name:
     type: string_textfield
     weight: -4
@@ -136,30 +134,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  phone:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  phone2:
-    type: string_textfield
-    weight: 1
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  postal_address:
-    type: string_textarea
-    weight: 2
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
   user_id:
     type: entity_reference_autocomplete
     weight: 5
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_sex.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_sex.yml
new file mode 100644
index 0000000..7b222dc
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_sex.yml
@@ -0,0 +1,20 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_sex
+    - opencase_entities.oc_actor_type.client
+  module:
+    - options
+id: oc_actor.client.field_sex
+field_name: field_sex
+entity_type: oc_actor
+bundle: client
+label: Sex
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_sex.yml b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_sex.yml
new file mode 100644
index 0000000..6a56623
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_sex.yml
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_sex
+field_name: field_sex
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: Male
+      label: Male
+    -
+      value: Female
+      label: Female
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false