diff --git a/config/block.block.views_block__activities_block_1.yml b/config/block.block.views_block__activities_block_1.yml
index 6f42307..acd8c6a 100644
--- a/config/block.block.views_block__activities_block_1.yml
+++ b/config/block.block.views_block__activities_block_1.yml
@@ -5,6 +5,7 @@ dependencies:
   config:
     - views.view.activities
   module:
+    - route_condition
     - views
   theme:
     - bartik
@@ -22,4 +23,8 @@ settings:
   context_mapping: {  }
   views_label: ''
   items_per_page: none
-visibility: {  }
+visibility:
+  route:
+    id: route
+    negate: false
+    routes: entity.oc_actor.canonical
diff --git a/config/core.entity_form_display.oc_case.accommodation.default.yml b/config/core.entity_form_display.oc_case.accommodation.default.yml
index afca814..8344cd4 100644
--- a/config/core.entity_form_display.oc_case.accommodation.default.yml
+++ b/config/core.entity_form_display.oc_case.accommodation.default.yml
@@ -18,42 +18,52 @@ mode: default
 content:
   field_case_finance:
     type: options_select
-    weight: 1
+    weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
   field_fee_calculation:
     type: options_select
-    weight: 3
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
   field_fee_or_equivalent_cost:
     type: number
-    weight: 2
+    weight: 4
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
   field_outcome:
     type: options_select
-    weight: 26
+    weight: 6
     region: content
     settings: {  }
     third_party_settings: {  }
   field_type_of_acco:
     type: options_select
-    weight: 0
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }
   files:
     type: file_generic
-    weight: -1
+    weight: 1
     region: content
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 0
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
 hidden:
   notes: true
   status: true
diff --git a/config/core.entity_form_display.oc_case_fee.fee.default.yml b/config/core.entity_form_display.oc_case_fee.fee.default.yml
new file mode 100644
index 0000000..63a98e8
--- /dev/null
+++ b/config/core.entity_form_display.oc_case_fee.fee.default.yml
@@ -0,0 +1,43 @@
+uuid: 9c6530a7-4c3c-447c-ba44-1666df974e9e
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_fee_type.fee
+id: oc_case_fee.fee.default
+targetEntityType: oc_case_fee
+bundle: fee
+mode: default
+content:
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_case:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  user_id:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  amount: true
+  oc_fee_category: true
+  status: true
diff --git a/config/core.entity_form_display.oc_case_provision.caseworker.default.yml b/config/core.entity_form_display.oc_case_provision.caseworker.default.yml
new file mode 100644
index 0000000..bf191b2
--- /dev/null
+++ b/config/core.entity_form_display.oc_case_provision.caseworker.default.yml
@@ -0,0 +1,54 @@
+uuid: 60d3b187-2270-4cff-884f-7242f4273f2d
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_provision_type.caseworker
+id: oc_case_provision.caseworker.default
+targetEntityType: oc_case_provision
+bundle: caseworker
+mode: default
+content:
+  oc_case:
+    type: entity_reference_autocomplete
+    weight: 0
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_case_provider_role:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  user_id:
+    type: entity_reference_autocomplete
+    weight: 3
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  name: true
+  status: true
diff --git a/config/core.entity_view_display.oc_case.accommodation.default.yml b/config/core.entity_view_display.oc_case.accommodation.default.yml
index a39cea9..d560ab1 100644
--- a/config/core.entity_view_display.oc_case.accommodation.default.yml
+++ b/config/core.entity_view_display.oc_case.accommodation.default.yml
@@ -23,14 +23,14 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
   field_fee_calculation:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 3
+    weight: 4
     region: content
   field_fee_or_equivalent_cost:
     type: number_decimal
@@ -41,21 +41,21 @@ content:
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
-    weight: 2
+    weight: 3
     region: content
   field_outcome:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 4
+    weight: 5
     region: content
   field_type_of_acco:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
   files:
     type: file_default
@@ -63,14 +63,22 @@ content:
     settings:
       use_description_as_link_text: true
     third_party_settings: {  }
-    weight: 82
+    weight: 7
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 0
     region: content
   user_id:
     type: author
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 80
+    weight: 6
     region: content
 hidden:
   changed: true
diff --git a/config/core.entity_view_display.oc_case_fee.fee.default.yml b/config/core.entity_view_display.oc_case_fee.fee.default.yml
new file mode 100644
index 0000000..9e4efcb
--- /dev/null
+++ b/config/core.entity_view_display.oc_case_fee.fee.default.yml
@@ -0,0 +1,41 @@
+uuid: 0f6f56e5-27c1-459e-b8a8-a54396c1e443
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_fee_type.fee
+  module:
+    - user
+id: oc_case_fee.fee.default
+targetEntityType: oc_case_fee
+bundle: fee
+mode: default
+content:
+  name:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  oc_case:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  user_id:
+    type: author
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+hidden:
+  amount: true
+  oc_fee_category: true
+  search_api_excerpt: true
+  status: true
diff --git a/config/core.entity_view_display.oc_case_provision.caseworker.default.yml b/config/core.entity_view_display.oc_case_provision.caseworker.default.yml
new file mode 100644
index 0000000..f3a014b
--- /dev/null
+++ b/config/core.entity_view_display.oc_case_provision.caseworker.default.yml
@@ -0,0 +1,47 @@
+uuid: d748e2ca-1e99-44d7-8fe5-d59b064becff
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_provision_type.caseworker
+  module:
+    - user
+id: oc_case_provision.caseworker.default
+targetEntityType: oc_case_provision
+bundle: caseworker
+mode: default
+content:
+  oc_case:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  oc_case_provider_role:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  user_id:
+    type: author
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
+hidden:
+  name: true
+  search_api_excerpt: true
diff --git a/config/opencase_cases.oc_case_fee_type.fee.yml b/config/opencase_cases.oc_case_fee_type.fee.yml
new file mode 100644
index 0000000..b3b3c5b
--- /dev/null
+++ b/config/opencase_cases.oc_case_fee_type.fee.yml
@@ -0,0 +1,6 @@
+uuid: f9a5c3c2-6a08-42f6-bf87-4b9972b02b4f
+langcode: en
+status: true
+dependencies: {  }
+id: fee
+label: Fee
diff --git a/config/opencase_cases.oc_case_provision_type.caseworker.yml b/config/opencase_cases.oc_case_provision_type.caseworker.yml
new file mode 100644
index 0000000..1ca05ce
--- /dev/null
+++ b/config/opencase_cases.oc_case_provision_type.caseworker.yml
@@ -0,0 +1,6 @@
+uuid: 20044a20-050f-42a4-a213-93bb9ab276b2
+langcode: en
+status: true
+dependencies: {  }
+id: caseworker
+label: Caseworker
diff --git a/config/opencase_entities.oc_organisation_type.partner_organisation.yml b/config/opencase_entities.oc_organisation_type.partner_organisation.yml
new file mode 100644
index 0000000..d5d0738
--- /dev/null
+++ b/config/opencase_entities.oc_organisation_type.partner_organisation.yml
@@ -0,0 +1,6 @@
+uuid: 19c728dd-796b-4773-8acd-21869a047277
+langcode: en
+status: true
+dependencies: {  }
+id: partner_organisation
+label: 'Partner Organisation'
diff --git a/config/taxonomy.vocabulary.oc_case_provider_role.yml b/config/taxonomy.vocabulary.oc_case_provider_role.yml
new file mode 100644
index 0000000..35e4d2b
--- /dev/null
+++ b/config/taxonomy.vocabulary.oc_case_provider_role.yml
@@ -0,0 +1,8 @@
+uuid: 85aacc47-8df9-4309-b7f4-f58be70f83d0
+langcode: en
+status: true
+dependencies: {  }
+name: 'Case Provider Roles'
+vid: oc_case_provider_role
+description: ''
+weight: 0
diff --git a/config/taxonomy.vocabulary.oc_fee_category.yml b/config/taxonomy.vocabulary.oc_fee_category.yml
new file mode 100644
index 0000000..842c389
--- /dev/null
+++ b/config/taxonomy.vocabulary.oc_fee_category.yml
@@ -0,0 +1,8 @@
+uuid: 93a96bb4-da95-4d69-be37-d1477624f849
+langcode: en
+status: true
+dependencies: {  }
+name: 'Fee categories'
+vid: oc_fee_category
+description: ''
+weight: 0
diff --git a/config/views.view.activities.yml b/config/views.view.activities.yml
index eb7e9b5..ddca13d 100644
--- a/config/views.view.activities.yml
+++ b/config/views.view.activities.yml
@@ -2,8 +2,11 @@ uuid: 94f53966-e29c-43e2-83ae-1a4c967ea98b
 langcode: en
 status: true
 dependencies:
+  config:
+    - user.role.authenticated
   module:
     - opencase_entities
+    - user
 id: activities
 label: Activities
 module: views
@@ -18,6 +21,7 @@ display:
     display_plugin: default
     position: 0
     display_options:
+      title: Activities
       fields:
         name:
           id: name
@@ -178,8 +182,10 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       access:
-        type: none
-        options: {  }
+        type: role
+        options:
+          role:
+            authenticated: authenticated
       cache:
         type: tag
         options: {  }
@@ -264,20 +270,7 @@ display:
           replica: false
           query_tags: {  }
       relationships: {  }
-      header:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: yhings
-            format: basic_html
-          tokenize: false
+      header: {  }
       footer: {  }
       display_extenders: {  }
     cache_metadata:
@@ -287,6 +280,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user.roles
       tags: {  }
   block_1:
     id: block_1
@@ -296,6 +290,7 @@ display:
     display_options:
       display_description: ''
       display_extenders: {  }
+      block_hide_empty: true
     cache_metadata:
       max-age: -1
       contexts:
@@ -303,4 +298,5 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user.roles
       tags: {  }
diff --git a/config/views.view.case_providers.yml b/config/views.view.case_providers.yml
new file mode 100644
index 0000000..64ffad9
--- /dev/null
+++ b/config/views.view.case_providers.yml
@@ -0,0 +1,220 @@
+uuid: 20fed501-ec98-4f7e-a082-56669f688310
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_actor_type.staff_member
+    - opencase_entities.oc_actor_type.volunteer
+  module:
+    - opencase_entities
+id: case_providers
+label: 'Case providers'
+module: views
+description: ''
+tag: ''
+base_table: oc_actor_field_data
+base_field: id
+display:
+  default:
+    id: default
+    display_title: Default
+    display_plugin: default
+    position: 0
+    display_options:
+      fields:
+        name:
+          id: name
+          table: oc_actor_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: null
+          entity_field: name
+          plugin_id: field
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 10
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts: {  }
+      arguments: {  }
+      filters:
+        type:
+          id: type
+          table: oc_actor_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          entity_field: type
+          plugin_id: bundle
+          operator: in
+          value:
+            staff_member: staff_member
+            volunteer: volunteer
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+      tags: {  }
+  entity_reference_1:
+    id: entity_reference_1
+    display_title: 'Entity Reference'
+    display_plugin: entity_reference
+    position: 1
+    display_options:
+      style:
+        type: entity_reference
+        options:
+          search_fields:
+            name: name
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+      tags: {  }