diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss
index 3aee370434..f17900e95a 100644
--- a/app/assets/stylesheets/base/variables.scss
+++ b/app/assets/stylesheets/base/variables.scss
@@ -7,7 +7,20 @@ $sidebar-active: #365CF5;
 $sidebar-dark: #1A2142;
 
 :root {
-  --dark: #262d3f; 
+  --casa-red: #D50100;
+  --casa-primary-blue: #4A6CF7;
+
+  --gunmetal: #262D3F;
+  --dark-gunmetal: #212529;
+  --dark: #262d3f;
+  --dark-electric-blue: #5D657B;
   --gray: #5d657b;
+  --dark-gray: #AAAAAA;
+  --gray-80: #CCCCCC;
   --silver: #D9D9D9;
+
+  --inactive: #9AA4CA;
+
+  --input-placeholder-text: var(--gray);
+  --input-border-color: var(--gray-80);
 }
diff --git a/app/assets/stylesheets/pages/case_contacts.scss b/app/assets/stylesheets/pages/case_contacts.scss
index b30659d726..67a1a4fc71 100644
--- a/app/assets/stylesheets/pages/case_contacts.scss
+++ b/app/assets/stylesheets/pages/case_contacts.scss
@@ -1,16 +1,7 @@
-
-fieldset {
-    border: 1px double #CCC;
-}
-
 .slide-container {
     padding: 0rem 1rem;
 }
 
-legend {
-    font-size: small;
-}
-
 .slider {
     display: inline;
 }
@@ -90,7 +81,7 @@ legend {
         }
     }
  }
- 
+
 .other-expenses li {
     margin-bottom: .2rem;
 }
@@ -118,7 +109,7 @@ legend {
     display: flex;
     align-items: center;
   }
-  
+
 .dollar-sign .other-expense-amount {
     position: relative;
     padding-left: 32px;
@@ -135,7 +126,7 @@ legend {
     left: 28px;
     z-index: 100;
 }
-  
+
 .pr-7 {
     padding-right: 1.5rem !important;
     padding-left: 2.5rem !important;
diff --git a/app/assets/stylesheets/pages/case_contacts_form.scss b/app/assets/stylesheets/pages/case_contacts_form.scss
index 6007418ba6..5f0121391d 100644
--- a/app/assets/stylesheets/pages/case_contacts_form.scss
+++ b/app/assets/stylesheets/pages/case_contacts_form.scss
@@ -1,31 +1,151 @@
 @use "../base/breakpoints.scss" as screen-sizes;
 
-.case-contacts-form {
-  &-buttons {
-    display: flex;
-    justify-content: flex-end;
-    gap: 10px;
+#case-contact-form {
+  color: var(--gunmetal);
 
-    @media only screen and (max-width: screen-sizes.$mobile) {
-      & > a, & > button {
-        flex-grow: 1;
+  & section {
+    background: var(--white, #FFFFFF);
+    border: 1px solid var(--form-element-stroke, #E5E5E5);
+    border-radius: 10px;
+    box-shadow: 0px 0px 5px 0px #1A252F0D;
+    margin-bottom: 30px;
+    padding: 30px 20px;
+  }
+
+  & h2 {
+    font-size: 28px;
+    margin-bottom: 24px;
+  }
+
+  & h3 {
+    font-size: 16px;
+  }
+
+  & legend {
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 19px;
+    color: var(--dark-electric-blue);
+  }
+
+  & label {
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 19px;
+  }
+
+  & input,
+  textarea,
+  select {
+    border: 1px solid var(--input-border-color);
+
+    &::placeholder {
+      color: var(--input-placeholder-text);
+      opacity: 1;
+    }
+  }
+
+  & input[type="text"],
+  input[type="date"],
+  input[type="number"],
+  textarea,
+  select {
+    padding: 16px;
+  }
+
+  & .form-check {
+    margin-left: 0px;
+    padding-left: 0px;
+
+    & input {
+      width: 20px;
+      height: 20px;
+      margin-left: 0px;
+      margin-right: 3px;
+      float: none;
+
+      &:checked {
+        background-color: var(--casa-primary-blue);
+        border-color: var(--casa-primary-blue);
+      }
+
+      &[type="checkbox"] + label {
+        padding-top: 5px;
+        font-weight: 300;
       }
+
+      &[type="radio"] + label {
+        padding-top: 1px;
+        font-size: 16px;
+        font-weight: 300;
+        line-height: 25px;
+        color: var(--dark-electric-blue)
+      }
+    }
+
+    label {
+      font-size: 16px;
+      font-weight: 600;
     }
   }
 
-  &-checkbox {
-    border-color: #757575;
+  & button {
+    --bs-link-color: var(--casa-primary-blue);
+
+    &.btn-link {
+      text-decoration: none;
+      padding: 0px;
+    }
   }
 
-  &-title {
-    @media only screen and (max-width: screen-sizes.$mobile) {
-      font-size: 28px;
-    } 
+  & .row {
+    --bs-gutter-x: .5rem;
+  }
+
+  & #contact-form-types {
+    --group-width: 250px;
+
+    columns: var(--group-width);
+
+    & fieldset {
+      display: inline-block;
+      width: var(--group-width);
+      margin-bottom: .25rem;
+
+      & .form-check {
+        & label {
+          display: inline;
+          color: var(--dark);
+          font-weight: 400;
+          color: var(--dark-gunmetal);
+        }
+
+        & small {
+          display: block;
+          margin-left: 28px;
+          font-style: italic;
+          font-weight: 300;
+          color: var(--dark-electric-blue);
+        }
+      }
+    }
+  }
+
+  & .input-group-text {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
   }
 
-  &-subtitle {
+  & #contact-form-action-buttons {
+    display: flex;
+    justify-content: flex-end;
+    gap: 10px;
+
     @media only screen and (max-width: screen-sizes.$mobile) {
-      font-size: 24px;
-    } 
+      & > a, & > button {
+        flex-grow: 1;
+      }
+    }
   }
-}
\ No newline at end of file
+}
+
diff --git a/app/assets/stylesheets/shared/form.scss b/app/assets/stylesheets/shared/form.scss
index e5d7fd8fb7..35f3aae004 100644
--- a/app/assets/stylesheets/shared/form.scss
+++ b/app/assets/stylesheets/shared/form.scss
@@ -33,9 +33,3 @@ form {
   display: initial;
 }
 
-.details__topics-label {
-  span {
-    display: initial;
-  }
-
-}
diff --git a/app/components/form/hour_minute_duration_component.html.erb b/app/components/form/hour_minute_duration_component.html.erb
index 7a0ba75ba4..146096ed98 100644
--- a/app/components/form/hour_minute_duration_component.html.erb
+++ b/app/components/form/hour_minute_duration_component.html.erb
@@ -1,20 +1,18 @@
-<div class="d-flex flex-column flex-lg-row gap-2">
-  <div class="col input-style-1">
+<div class="row input-style-1">
+  <div class="col-12 col-md">
     <%= @form.label :duration_hours, "Hour(s)" %>
     <%= @form.number_field :duration_hours,
       min: 0,
       class: "form-control",
-      size: "10",
       style: "background:white",
       value: @hour_value,
       required: true %>
   </div>
-  <div class="col input-style-1">
+  <div class="col-12 col-md">
     <%= @form.label :duration_minutes, "Minute(s)" %>
     <%= @form.number_field :duration_minutes,
       min: 0,
       class: "form-control",
-      size: "10",
       style: "background:white",
       value: @minute_value,
       required: true %>
diff --git a/app/components/form/multiple_select_component.html.erb b/app/components/form/multiple_select_component.html.erb
index dbccceb530..58bb6f3098 100644
--- a/app/components/form/multiple_select_component.html.erb
+++ b/app/components/form/multiple_select_component.html.erb
@@ -2,6 +2,7 @@
      data-controller="multiple-select"
      data-multiple-select-options-value="<%= @options %>"
      data-multiple-select-selected-items-value="<%= @selected_items %>"
+     data-multiple-select-placeholder-term-value="<%= @placeholder_term %>"
      data-multiple-select-with-options-value="true">
 
   <template data-multiple-select-target="option">
diff --git a/app/components/form/multiple_select_component.rb b/app/components/form/multiple_select_component.rb
index 1e0fc4219c..4df7c864bc 100644
--- a/app/components/form/multiple_select_component.rb
+++ b/app/components/form/multiple_select_component.rb
@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 class Form::MultipleSelectComponent < ViewComponent::Base
-  def initialize(form:, name:, options:, selected_items:, render_option_subtext: false)
+  def initialize(form:, name:, options:, selected_items:, render_option_subtext: false, placeholder_term: nil)
     @form = form
     @name = name
     @options = options.to_json
     @selected_items = selected_items
     @render_option_subtext = render_option_subtext
+    @placeholder_term = placeholder_term
   end
 end
diff --git a/app/components/form/submit_button_component.html.erb b/app/components/form/submit_button_component.html.erb
deleted file mode 100644
index 347c2bbcd4..0000000000
--- a/app/components/form/submit_button_component.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= button_tag type: "submit", class: "btn-sm main-btn primary-btn btn-hover" do %>
-  <i class="lni lni-checkmark-circle mr-5"></i><%= button_text %>
-<% end %>
diff --git a/app/components/form/submit_button_component.rb b/app/components/form/submit_button_component.rb
deleted file mode 100644
index 5349b1ea20..0000000000
--- a/app/components/form/submit_button_component.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class Form::SubmitButtonComponent < ViewComponent::Base
-  def initialize(last_step:, current_step:)
-    @last_step = last_step
-    @current_step = current_step
-  end
-
-  def button_text
-    return "Submit" if @last_step == @current_step
-    "Save and Continue"
-  end
-end
diff --git a/app/components/form/title_component.html.erb b/app/components/form/title_component.html.erb
deleted file mode 100644
index 4935a40d4a..0000000000
--- a/app/components/form/title_component.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="title-wrapper pt-30">
-  <div class="title mb-30">
-    <div class="align-items-baseline d-md-flex gap-3">
-      <h1 class="case-contacts-form-title"><%= @title %></h1>
-      <% if @autosave %>
-        <small data-autosave-target="alert"></small>
-      <% end %>
-    </div>
-
-    <div class="row align-items-center mt-5">
-      <h2 class="col-12 col-md-6 case-contacts-form-subtitle"><%= @subtitle %></h2>
-      <% if @progress %>
-        <div class="col-12 col-md-6 align-items-center d-flex gap-2 mt-2 mt-md-0">
-          <p class="col-auto">
-            <%= @steps_in_text %>
-          </p>
-          <div class="col">
-            <div class="progress">
-              <div class="progress-bar primary-bg" role="progressbar" style="width: <%= @progress %>%" aria-valuenow="<%= @progress %>" aria-valuemin="0" aria-valuemax="100"></div>
-            </div>
-          </div>
-        </div>
-      <% end %>
-    </div>
-
-    <p class="mt-2">
-      <%= @notes %>
-    </p>
-  </div>
-</div>
diff --git a/app/components/form/title_component.rb b/app/components/form/title_component.rb
deleted file mode 100644
index 4df2fae12c..0000000000
--- a/app/components/form/title_component.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class Form::TitleComponent < ViewComponent::Base
-  def initialize(title:, subtitle:, step: nil, total_steps: nil, notes: nil, autosave: false)
-    @title = title
-    @subtitle = subtitle
-    @notes = notes
-    @autosave = autosave
-
-    if step && total_steps
-      @steps_in_text = "Step #{step} of #{total_steps}"
-      @progress = (step.to_d / total_steps.to_d) * 100
-    end
-  end
-end
diff --git a/app/controllers/additional_expenses_controller.rb b/app/controllers/additional_expenses_controller.rb
new file mode 100644
index 0000000000..49ee7a6316
--- /dev/null
+++ b/app/controllers/additional_expenses_controller.rb
@@ -0,0 +1,30 @@
+class AdditionalExpensesController < ApplicationController
+  before_action :force_json_format
+
+  def create
+    @additional_expense = AdditionalExpense.new(additional_expense_params)
+    authorize @additional_expense
+
+    if @additional_expense.save
+      render json: @additional_expense.as_json, status: :created
+    else
+      render json: @additional_expense.errors.as_json, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    @additional_expense = AdditionalExpense.find(params[:id])
+    authorize @additional_expense
+
+    @additional_expense.destroy!
+
+    head :no_content
+  end
+
+  private
+
+  def additional_expense_params
+    params.require(:additional_expense)
+      .permit(:case_contact_id, :other_expense_amount, :other_expenses_describe)
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2783fd451f..e641b457bb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,6 +17,7 @@ class ApplicationController < ActionController::Base
   rescue_from StandardError, with: :log_and_reraise
   rescue_from Pundit::NotAuthorizedError, with: :not_authorized
   rescue_from Organizational::UnknownOrganization, with: :not_authorized
+  rescue_from ActionController::UnknownFormat, with: :unsupported_media_type
 
   impersonates :user
 
@@ -34,6 +35,7 @@ def after_sign_out_path_for(resource_or_scope)
   end
 
   def set_active_banner
+    return nil unless request.format.html?
     return nil unless current_organization
 
     @active_banner = current_organization.banners.active.first
@@ -111,6 +113,12 @@ def redirect_back_to_referer(fallback_location:)
 
   private
 
+  # Allows us to not specify respond_to formats in json-only controller or action.
+  # Same behavior as when a request format is not defined in a respond_to block.
+  def force_json_format
+    raise ActionController::UnknownFormat unless request.format.json?
+  end
+
   def store_user_location!
     # the current URL can be accessed from a session
     store_location_for(:user, request.fullpath)
@@ -135,9 +143,29 @@ def set_current_organization
   end
 
   def not_authorized
-    session[:user_return_to] = nil
-    flash[:notice] = "Sorry, you are not authorized to perform this action."
-    redirect_to(root_url)
+    message = "Sorry, you are not authorized to perform this action."
+    respond_to do |format|
+      format.json do
+        render json: {error: message}, status: :unauthorized
+      end
+      format.any do
+        session[:user_return_to] = nil
+        flash[:notice] = message
+        redirect_to(root_url)
+      end
+    end
+  end
+
+  def unsupported_media_type
+    respond_to do |format|
+      format.json do
+        render json: {error: "json unsupported"}, status: :unsupported_media_type
+      end
+      format.any do
+        flash[:alert] = "Page not found"
+        redirect_back_or_to root_url
+      end
+    end
   end
 
   def log_and_reraise(error)
diff --git a/app/controllers/case_contacts/form_controller.rb b/app/controllers/case_contacts/form_controller.rb
index bb30da7631..da639f9654 100644
--- a/app/controllers/case_contacts/form_controller.rb
+++ b/app/controllers/case_contacts/form_controller.rb
@@ -1,47 +1,42 @@
 class CaseContacts::FormController < ApplicationController
   include Wicked::Wizard
 
-  before_action :set_progress
   before_action :require_organization!
   before_action :set_case_contact, only: [:show, :update]
-  prepend_before_action :set_steps, only: [:show, :update]
   after_action :verify_authorized
 
-  # wizard_path
+  steps :details
+
   def show
     authorize @case_contact
-    get_cases_and_contact_types
-    @page = wizard_steps.index(step) + 1
-    @total_pages = steps.count
+
+    prepare_form
 
     render_wizard
-    wizard_path
   end
 
   def update
     authorize @case_contact
-    params[:case_contact][:status] = CaseContact.statuses[step] if !@case_contact.active?
+
     remove_unwanted_contact_types
     remove_nil_draft_ids
 
-    if @case_contact.update(case_contact_params)
-      respond_to do |format|
-        format.html {
-          if step == steps.last
-            finish_editing
-          else
-            render_wizard @case_contact, {}, {case_contact_id: @case_contact.id}
-          end
-        }
-        format.json { head :ok }
-      end
-    else
-      respond_to do |format|
-        format.html {
-          get_cases_and_contact_types
+    respond_to do |format|
+      format.html do
+        params[:case_contact][:status] = CaseContact.statuses[step] if !@case_contact.active?
+        if @case_contact.update(case_contact_params)
+          finish_editing
+        else
+          prepare_form
           render step
-        }
-        format.json { head :internal_server_error }
+        end
+      end
+      format.json do
+        if @case_contact.update(case_contact_params)
+          render json: @case_contact, status: :ok
+        else
+          render json: @case_contact.errors.full_messages, status: :unprocessable_entity
+        end
       end
     end
   end
@@ -49,23 +44,57 @@ def update
   private
 
   def set_case_contact
-    @case_contact = CaseContact.includes(:creator, contact_topic_answers: :contact_topic)
+    @case_contact = CaseContact
+      .includes(:creator, :contact_topic_answers)
       .find(params[:case_contact_id])
   end
 
-  def get_cases_and_contact_types
-    @casa_cases = policy_scope(current_organization.casa_cases).includes([:volunteers])
-    @casa_cases = @casa_cases.where(id: @case_contact.casa_case_id) if @case_contact.active?
+  def prepare_form
+    @casa_cases = get_casa_cases
+    contact_types = get_contact_types.decorate
+    @grouped_contact_types = group_contact_types_by_name(contact_types)
+    @contact_topics = get_contact_topics
+
+    if !@case_contact.active? && @case_contact.contact_topic_answers.empty?
+      if @contact_topics.present?
+        @case_contact.contact_topic_answers.create
+      end
+    end
+  end
+
+  def get_casa_cases
+    casa_cases = policy_scope(current_organization.casa_cases).includes([:volunteers])
+    casa_cases = casa_cases.where(id: @case_contact.casa_case_id) if @case_contact.active?
+    casa_cases
+  end
 
-    @contact_types = ContactType.includes(:contact_type_group)
+  def get_contact_types
+    case_contact_types = ContactType.includes(:contact_type_group)
       .joins(:casa_case_contact_types)
+      .active
       .where(casa_case_contact_types: {casa_case_id: @casa_cases.pluck(:id)})
 
-    @contact_types = current_organization.contact_types.includes(:contact_type_group) if @contact_types.empty?
-    @contact_types.order(name: :asc)
+    if case_contact_types.present?
+      case_contact_types
+    else
+      ContactType
+        .includes(:contact_type_group)
+        .joins(:contact_type_group)
+        .active
+        .where(contact_type_group: {casa_org: current_organization})
+        .order("contact_type_group.name ASC", :name)
+    end
+  end
 
-    @selected_cases = @case_contact.draft_case_ids
-    @selected_contact_type_ids = @case_contact.contact_type_ids
+  def get_contact_topics
+    ContactTopic
+      .active
+      .where(casa_org: current_organization)
+      .order(:question)
+  end
+
+  def group_contact_types_by_name(contact_types)
+    contact_types.group_by { |ct| ct.contact_type_group.name }
   end
 
   def finish_editing
@@ -144,16 +173,4 @@ def remove_unwanted_contact_types
   def remove_nil_draft_ids
     params[:case_contact][:draft_case_ids] -= [""] if params.dig(:case_contact, :draft_case_ids)
   end
-
-  def set_progress
-    @progress = if wizard_steps.any? && wizard_steps.index(step).present?
-      ((wizard_steps.index(step) + 1).to_d / wizard_steps.count.to_d) * 100
-    else
-      0
-    end
-  end
-
-  def set_steps
-    self.steps = CaseContact.find(params[:case_contact_id]).form_steps
-  end
 end
diff --git a/app/controllers/case_contacts_controller.rb b/app/controllers/case_contacts_controller.rb
index de49314d68..c2fb34d746 100644
--- a/app/controllers/case_contacts_controller.rb
+++ b/app/controllers/case_contacts_controller.rb
@@ -33,25 +33,24 @@ def drafts
 
   def new
     store_referring_location
-    authorize CaseContact
 
     casa_cases = policy_scope(current_organization.casa_cases)
     draft_case_ids = build_draft_case_ids(params, casa_cases)
 
-    @case_contact = CaseContact.create_with_answers(current_organization,
-      creator: current_user, draft_case_ids: draft_case_ids, contact_made: true)
+    @case_contact = CaseContact.create(creator: current_user, draft_case_ids: draft_case_ids, contact_made: true)
+    authorize @case_contact
 
     if @case_contact.errors.any?
       flash[:alert] = @case_contact.errors.full_messages.join("\n")
       redirect_to request.referer
     else
-      redirect_to case_contact_form_path(@case_contact.form_steps.first, case_contact_id: @case_contact.id)
+      redirect_to case_contact_form_path(:details, case_contact_id: @case_contact.id)
     end
   end
 
   def edit
     authorize @case_contact
-    redirect_to case_contact_form_path(CaseContact::FORM_STEPS.first, case_contact_id: @case_contact.id)
+    redirect_to case_contact_form_path(:details, case_contact_id: @case_contact.id)
   end
 
   def destroy
diff --git a/app/controllers/contact_topic_answers_controller.rb b/app/controllers/contact_topic_answers_controller.rb
new file mode 100644
index 0000000000..717a51ed7a
--- /dev/null
+++ b/app/controllers/contact_topic_answers_controller.rb
@@ -0,0 +1,30 @@
+class ContactTopicAnswersController < ApplicationController
+  before_action :force_json_format
+
+  def create
+    @contact_topic_answer = ContactTopicAnswer.new(contact_topic_answer_params)
+    authorize @contact_topic_answer
+
+    if @contact_topic_answer.save
+      render json: @contact_topic_answer.as_json, status: :created
+    else
+      render json: @contact_topic_answer.errors.as_json, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    @contact_topic_answer = ContactTopicAnswer.find(params[:id])
+    authorize @contact_topic_answer
+
+    @contact_topic_answer.destroy!
+
+    head :no_content
+  end
+
+  private
+
+  def contact_topic_answer_params
+    params.require(:contact_topic_answer)
+      .permit(:id, :contact_topic_id, :case_contact_id, :value, :_destroy)
+  end
+end
diff --git a/app/decorators/case_contact_decorator.rb b/app/decorators/case_contact_decorator.rb
index 424c759beb..c03d6d100c 100644
--- a/app/decorators/case_contact_decorator.rb
+++ b/app/decorators/case_contact_decorator.rb
@@ -112,13 +112,15 @@ def address_of_volunteer
       volunteer_address
     elsif volunteer
       volunteer.address&.content
-    else
-      "There are two or more volunteers assigned to this case and you are trying to set the address for both of them. This is not currently possible."
     end
   end
 
+  def ambiguous_volunteer_address_message
+    "There are two or more volunteers assigned to this case and you are trying to set the address for both of them. This is not currently possible."
+  end
+
   def form_title
-    active? ? "Editing existing case contact" : "Record new case contact"
+    active? ? "Editing Existing Case Contact" : "Record New Case Contact"
   end
 
   def form_page_notes
diff --git a/app/javascript/controllers/autosave_controller.js b/app/javascript/controllers/autosave_controller.js
index 1069f844df..5412001be0 100644
--- a/app/javascript/controllers/autosave_controller.js
+++ b/app/javascript/controllers/autosave_controller.js
@@ -1,4 +1,5 @@
 import { Controller } from '@hotwired/stimulus'
+import { debounce } from 'lodash'
 
 export default class extends Controller {
   static targets = ['form', 'alert']
@@ -6,52 +7,107 @@ export default class extends Controller {
     delay: {
       type: Number,
       default: 1000 // milliseconds to delay form submission
+    },
+    clearDelay: {
+      type: Number,
+      default: 3000 // milliseconds to delay hiding alert
     }
   }
 
   static classes = ['goodAlert', 'badAlert']
 
+  connect () {
+    this.visibleClass = 'visible'
+    this.hiddenClass = 'invisible'
+    this.save = debounce(this.save, this.delayValue).bind(this)
+  }
+
   save () {
     this.autosaveAlert()
-    clearTimeout(this.timeout)
-    this.timeout = setTimeout(() => this.submitForm(), this.delayValue)
+    this.submitForm()
   }
 
   submitForm () {
     fetch(this.formTarget.action, {
       method: 'POST',
+      headers: { Accept: 'application/json' },
       body: new FormData(this.formTarget)
     }).then(response => {
       if (response.ok) {
         this.goodAlert()
+        const event = new CustomEvent('autosave:success', { bubbles: true }) // eslint-disable-line no-undef
+        this.element.dispatchEvent(event)
       } else {
-        if (response.status === 504) {
+        return Promise.reject(response)
+      }
+    }).catch(error => {
+      console.error(error.status, error.statusText)
+      switch (error.status) {
+        case 504:
           this.badAlert('Connection lost: Changes will be saved when connection is restored.')
-        } else {
+          break
+        case 422:
+          error.json().then(errorJson => {
+            console.error('errorJson', errorJson)
+            const errorMessage = errorJson.join('. ')
+            this.badAlert(`Unable to save: ${errorMessage}`)
+          })
+          break
+        case 401:
+          this.badAlert('You must be signed in to save changes.')
+          break
+        default:
           this.badAlert('Error: Unable to save changes.')
-        }
       }
     })
   }
 
   autosaveAlert () {
     this.removeBadAlert()
-    this.alertTarget.innerHTML = 'Autosaving...'
+    this.alertTargets.forEach(alertTarget => {
+      alertTarget.innerHTML = 'Autosaving...'
+    })
+    this.revealAlert()
   }
 
   goodAlert () {
     this.removeBadAlert()
-    this.alertTarget.innerHTML = 'Saved!'
+    this.alertTargets.forEach(alertTarget => {
+      alertTarget.innerHTML = 'Saved!'
+    })
   }
 
   removeBadAlert () {
-    this.alertTarget.classList.add(this.goodAlertClass)
-    this.alertTarget.classList.remove(this.badAlertClass)
+    this.alertTargets.forEach(alertTarget => {
+      alertTarget.classList.add(this.goodAlertClass)
+      alertTarget.classList.remove(this.badAlertClass)
+    })
   }
 
   badAlert (message) {
-    this.alertTarget.classList.remove(this.goodAlertClass)
-    this.alertTarget.classList.add(this.badAlertClass)
-    this.alertTarget.innerHTML = message
+    this.alertTargets.forEach(alertTarget => {
+      alertTarget.classList.remove(this.goodAlertClass)
+      alertTarget.classList.add(this.badAlertClass)
+      alertTarget.innerHTML = message
+    })
+  }
+
+  hideAlert () {
+    this.alertTargets.forEach(alertTarget => {
+      alertTarget.classList.add(this.hiddenClass)
+      alertTarget.classList.remove(this.visibleClass)
+    })
+  }
+
+  revealAlert (hide = true) {
+    this.alertTargets.forEach(alertTarget => {
+      alertTarget.classList.remove(this.hiddenClass)
+      alertTarget.classList.add(this.visibleClass)
+    })
+    if (hide) {
+      setTimeout(() => {
+        this.hideAlert()
+      }, this.clearDelayValue)
+    }
   }
 }
diff --git a/app/javascript/controllers/casa_nested_form_controller.js b/app/javascript/controllers/casa_nested_form_controller.js
new file mode 100644
index 0000000000..b742298b5d
--- /dev/null
+++ b/app/javascript/controllers/casa_nested_form_controller.js
@@ -0,0 +1,194 @@
+import NestedForm from '@stimulus-components/rails-nested-form'
+
+/**
+ * Allows nested forms to be used with the autosave controller,
+ * creating and destroying records so that the autosave updates do not attempt
+ * to create/destroy same nested records repeatedly.
+ *
+ * Extends stimulus-rails-nested-form.
+ * https://www.stimulus-components.com/docs/stimulus-rails-nested-form/
+ * add() & remove() are standard, so can be used as stimulus-rails-nested-form.
+ * No values are necessary in that case.
+ *
+ * Created for the the CaseContact form (details), see its usage there.
+ *
+ * Connects to data-controller="casa-nested-form"
+ */
+export default class extends NestedForm {
+  static values = {
+    route: String, // path to create/destroy a record, e.g. "/contact_topic_answers"
+    parentName: String, // snake case name of parent model, e.g. "case_contact"
+    parentId: Number, // id of record this form is nested within e.g. @case_contact.id
+    modelName: String, // name of nested form, e.g. "contact_topic_answer"
+    requiredFields: { // fields required (belongs_to etc...) to pass validation (e.g. contact_topic_id)
+      type: Array, default: []
+    }
+  }
+
+  connect () {
+    super.connect()
+
+    const headers = new Headers()
+    headers.append('Content-Type', 'application/json')
+    headers.append('Accept', 'application/json')
+    const tokenTag = document.querySelector('meta[name="csrf-token"]')
+    if (tokenTag) { // does not exist in test environment
+      headers.append('X-CSRF-Token', tokenTag.content)
+    }
+    this.headers = headers
+
+    document.addEventListener('autosave:success', this.onAutosaveSuccess)
+  }
+
+  disconnect () {
+    document.removeEventListener('autosave:success', this.onAutosaveSuccess)
+  }
+
+  getRecordId (wrapper) {
+    const recordInput = wrapper.querySelector('input[name*="id"]')
+    if (!recordInput) {
+      console.warn('id input not found for nested item:', wrapper)
+      return ''
+    }
+    return recordInput.value
+  }
+
+  /* removes any items that have been marked as _destroy: true */
+  /* must be marked for destroy elsewhere, see case_contact_form_controller clearExpenses() */
+  onAutosaveSuccess = (_e) => {
+    const wrappers = this.element.querySelectorAll(this.wrapperSelectorValue)
+    wrappers.forEach(wrapper => {
+      const destroyInput = wrapper.querySelector("input[name*='_destroy']")
+      if (!destroyInput) {
+        console.warn('Destroy input not found for nested item:', wrapper)
+        return
+      }
+      if (destroyInput.value === '1') {
+        // autosave has already destroyed the record, remove the element from DOM
+        wrapper.remove()
+      }
+    })
+  }
+
+  dispatchChangeEvent (action) {
+    const detail = { modelName: this.modelNameValue, action }
+    const changeEvent = new CustomEvent('casa-nested-form:change', { detail, bubbles: true }) // eslint-disable-line no-undef
+    document.dispatchEvent(changeEvent)
+  }
+
+  /* Adds item to the form. Item will not be created until form submission. */
+  add (e) {
+    super.add(e)
+    this.dispatchChangeEvent('add')
+  }
+
+  /* Creates a new record for the added item (before submission). */
+  addAndCreate (e) {
+    this.add(e)
+    const items = this.element.querySelectorAll(this.wrapperSelectorValue)
+    const addedItem = items[items.length - 1]
+    // childIndex will be 0,1,... for items at page load, timestamps for items added to form.
+    const childIndex = addedItem.dataset.childIndex
+    const domIdBase = `${this.parentNameValue}_${this.modelNameValue}s_attributes_${childIndex}`
+
+    const fields = {}
+    fields[`${this.parentNameValue}_id`] = this.parentIdValue
+
+    this.requiredFieldsValue.forEach(field => {
+      const fieldId = `${domIdBase}_${field}`
+      const fieldEl = document.querySelector(`#${fieldId}`)
+      if (!fieldEl) {
+        console.warn('Aborting: Field not found:', fieldId)
+        return
+      }
+      fields[field] = fieldEl.value
+    })
+
+    if (Object.values(fields).some(value => value === '')) {
+      console.warn('Aborting: Required field empty:', fields)
+      return
+    }
+
+    const body = {}
+    body[this.modelNameValue] = fields
+
+    fetch(this.routeValue, {
+      method: 'POST',
+      headers: this.headers,
+      body: JSON.stringify(body)
+    })
+      .then(response => {
+        if (response.ok) {
+          return response.json()
+        } else {
+          return Promise.reject(response)
+        }
+      })
+      .then(data => {
+        const idAttr = `${domIdBase}_id`
+        const idField = document.querySelector(`#${idAttr}`)
+        idField.setAttribute('value', data.id)
+        addedItem.dataset.newRecord = false
+      })
+      .catch(error => {
+        console.error(error.status, error.statusText)
+        error.json().then(errorJson => {
+          console.error('errorJson', errorJson)
+        })
+      })
+  }
+
+  /* Removes item from the form. Will not destroy record until form submission. */
+  remove (e) {
+    super.remove(e)
+    this.dispatchChangeEvent('remove')
+  }
+
+  /* Destroys a record when removing the item (before submission). */
+  destroyAndRemove (e) {
+    const wrapper = e.target.closest(this.wrapperSelectorValue)
+    const recordId = this.getRecordId(wrapper)
+    if (wrapper.dataset.newRecord === 'false' && (recordId.length > 0)) {
+      fetch(`${this.routeValue}/${recordId}`, {
+        method: 'DELETE',
+        headers: this.headers
+      })
+        .then(response => {
+          if (response.ok) {
+            // destroy successful; remove as if new record
+            wrapper.dataset.newRecord = true
+            this.remove(e)
+          } else {
+            return Promise.reject(response)
+          }
+        })
+        .catch(error => {
+          console.error(error.status, error.statusText)
+          if (error.status === 404) {
+            // NOT FOUND: already deleted -> remove as if new record
+            wrapper.dataset.newRecord = true
+            this.remove(e)
+          } else {
+            error.json().then(errorJson => {
+              console.error('errorJson', errorJson)
+            })
+          }
+        })
+    } else {
+      console.warn(
+        'Conflicting information while trying to destroy record:', {
+          wrapperDatasetNewRecord: wrapper.dataset.newRecord,
+          recordId
+        }
+      )
+      this.remove(e) // treat as typical removal
+    }
+  }
+
+  confirmDestroyAndRemove (e) {
+    const text = 'Are you sure you want to remove this item?'
+    if (window.confirm(text)) {
+      this.destroyAndRemove(e)
+    }
+  }
+}
diff --git a/app/javascript/controllers/case_contact_form_controller.js b/app/javascript/controllers/case_contact_form_controller.js
new file mode 100644
index 0000000000..c712117db8
--- /dev/null
+++ b/app/javascript/controllers/case_contact_form_controller.js
@@ -0,0 +1,84 @@
+import { Controller } from '@hotwired/stimulus'
+
+// Connects to data-controller="case-contact-form"
+export default class extends Controller {
+  static targets = [
+    'addTopicButton',
+    'contactTopicSelect',
+    'expenseDestroy',
+    'milesDriven',
+    'volunteerAddress',
+    'reimbursementForm',
+    'wantDrivingReimbursement'
+  ]
+
+  connect () {
+    this.contactTopicCount = 0
+    if (this.hasContactTopicSelectTarget) {
+      this.contactTopicCount = (this.contactTopicSelectTargets[0].querySelectorAll('option').length) - 1
+      this.onContactTopicSelect()
+      this.toggleAddAnotherTopicButton()
+    }
+
+    this.setReimbursementFormVisibility()
+    document.addEventListener('casa-nested-form:change', (e) => this.onNestedFormChange(e))
+  }
+
+  toggleAddAnotherTopicButton () {
+    const currentCount = this.contactTopicSelectTargets.length
+    if (currentCount < this.contactTopicCount) {
+      this.addTopicButtonTarget.disabled = false
+    } else {
+      this.addTopicButtonTarget.disabled = true
+    }
+  }
+
+  onNestedFormChange (e) {
+    const { modelName } = e.detail
+    if (modelName === 'contact_topic_answer') {
+      this.onContactTopicSelect()
+      this.toggleAddAnotherTopicButton()
+    }
+  }
+
+  onContactTopicSelect (_e) {
+    const selectedValues = this.contactTopicSelectTargets.map(el => el.value)
+    this.contactTopicSelectTargets.forEach(el => {
+      const options = el.querySelectorAll('option')
+      options.forEach(option => {
+        if (selectedValues.includes(option.value)) {
+          if (option.selected) {
+            option.disabled = false
+          } else {
+            option.disabled = true
+          }
+        } else {
+          option.disabled = false
+        }
+      })
+    })
+  }
+
+  clearExpenses = () => {
+    // mark as _destroy: true. autosave has already created the records.
+    // if autosaved again, nested form controller will remove destroy: true items
+    // if the form is submitted, expense will be destroyed.
+    this.expenseDestroyTargets.forEach(el => (el.value = '1'))
+  }
+
+  clearMileage = () => {
+    this.milesDrivenTarget.value = 0
+    this.volunteerAddressTarget.value = ''
+  }
+
+  setReimbursementFormVisibility = () => {
+    if (this.wantDrivingReimbursementTarget.checked) {
+      this.reimbursementFormTarget.classList.remove('d-none')
+      this.expenseDestroyTargets.forEach(el => (el.value = '0'))
+    } else {
+      this.clearExpenses()
+      this.clearMileage()
+      this.reimbursementFormTarget.classList.add('d-none')
+    }
+  }
+}
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
index 064ffecf93..7bb572bdfb 100644
--- a/app/javascript/controllers/index.js
+++ b/app/javascript/controllers/index.js
@@ -9,12 +9,16 @@ import AlertController from './alert_controller'
 
 import AutosaveController from './autosave_controller'
 
-import DisableFormController from './disable_form_controller'
+import CasaNestedFormController from './casa_nested_form_controller'
 
-import DismissController from './dismiss_controller'
+import CaseContactFormController from './case_contact_form_controller'
 
 import CourtOrderFormController from './court_order_form_controller'
 
+import DisableFormController from './disable_form_controller'
+
+import DismissController from './dismiss_controller'
+
 import HelloController from './hello_controller'
 
 import IconToggleController from './icon_toggle_controller'
@@ -34,9 +38,11 @@ import TruncatedTextController from './truncated_text_controller'
 application.register('nested-form', RailsNestedForm)
 application.register('alert', AlertController)
 application.register('autosave', AutosaveController)
+application.register('casa-nested-form', CasaNestedFormController)
+application.register('case-contact-form', CaseContactFormController)
+application.register('court-order-form', CourtOrderFormController)
 application.register('disable-form', DisableFormController)
 application.register('dismiss', DismissController)
-application.register('court-order-form', CourtOrderFormController)
 application.register('hello', HelloController)
 application.register('icon-toggle', IconToggleController)
 application.register('multiple-select', MultipleSelectController)
diff --git a/app/javascript/controllers/multiple_select_controller.js b/app/javascript/controllers/multiple_select_controller.js
index 587ca75bb9..1ebd2dd6ec 100644
--- a/app/javascript/controllers/multiple_select_controller.js
+++ b/app/javascript/controllers/multiple_select_controller.js
@@ -6,7 +6,11 @@ export default class extends Controller {
   static values = {
     options: Array,
     selectedItems: Array,
-    withOptions: Boolean
+    withOptions: Boolean,
+    placeholderTerm: {
+      type: String,
+      default: 'contact(s)'
+    }
   }
 
   connect () {
@@ -31,6 +35,7 @@ export default class extends Controller {
   createMultiSelectWithOptionGroups () {
     const optionTemplate = this.optionTarget.innerHTML
     const itemTemplate = this.itemTarget.innerHTML
+    const placeholder = `Select or search ${this.placeholderTermValue}`
 
     /* eslint-disable no-new */
     new TomSelect(this.selectTarget, {
@@ -51,7 +56,7 @@ export default class extends Controller {
       },
       options: this.optionsValue,
       items: this.selectedItemsValue,
-      placeholder: 'Select or search for contacts',
+      placeholder,
       hidePlaceholder: true,
       searchField: ['text', 'group'],
       render: {
diff --git a/app/models/additional_expense.rb b/app/models/additional_expense.rb
index 12856b8ce2..981b1072c8 100644
--- a/app/models/additional_expense.rb
+++ b/app/models/additional_expense.rb
@@ -1,8 +1,19 @@
 class AdditionalExpense < ApplicationRecord
   belongs_to :case_contact
+  has_one :casa_case, through: :case_contact
+  has_one :casa_org, through: :case_contact
+  # case_contact.casa_org may be nil for draft contacts, use for fallback:
+  has_one :contact_creator, through: :case_contact, source: :creator
+  has_one :contact_creator_casa_org, through: :contact_creator, source: :casa_org
 
-  # validates :other_expense_amount, presence: true
-  validates :other_expenses_describe, presence: {message: "Expense description cannot be blank."}
+  validates :other_expenses_describe, presence: true, if: :describe_required?
+
+  alias_attribute :amount, :other_expense_amount
+  alias_attribute :describe, :other_expenses_describe
+
+  def describe_required?
+    other_expense_amount&.positive?
+  end
 end
 
 # == Schema Information
diff --git a/app/models/case_contact.rb b/app/models/case_contact.rb
index 2a14c7cb9d..fd270be55d 100644
--- a/app/models/case_contact.rb
+++ b/app/models/case_contact.rb
@@ -21,9 +21,9 @@ class CaseContact < ApplicationRecord
     message: :cant_be_future,
     allow_nil: true
   }
-  validate :reimbursement_only_when_miles_driven, if: :active_or_expenses?
-  validate :volunteer_address_when_reimbursement_wanted, if: :active_or_expenses?
-  validate :volunteer_address_is_valid, if: :active_or_expenses?
+  validate :reimbursement_only_when_miles_driven, if: :active_or_details?
+  validate :volunteer_address_when_reimbursement_wanted, if: :active_or_details?
+  validate :volunteer_address_is_valid, if: :active_or_details?
 
   belongs_to :creator, class_name: "User"
   has_one :supervisor_volunteer, -> {
@@ -32,25 +32,27 @@ class CaseContact < ApplicationRecord
   has_one :supervisor, through: :creator
   has_many :followups
 
-  # Draft support requires the casa_case to be nil if the contact is in_progress
+  # Draft casa_case_id is nil until active
   belongs_to :casa_case, optional: true
   has_one :casa_org, through: :casa_case
+  # Use creator_casa_org as fallback org relationship for drafts
+  has_one :creator_casa_org, through: :creator, source: :casa_org
   validates :casa_case_id, presence: true, if: :active?
-  validates :draft_case_ids, presence: {message: :must_be_selected}, unless: :started?
+  validates :draft_case_ids, presence: {message: :must_be_selected}, if: :active_or_details?
 
   has_many :case_contact_contact_types
+  validates :case_contact_contact_types, presence: {message: :must_be_selected}, if: :active_or_details?
   has_many :contact_types, through: :case_contact_contact_types
 
   has_many :additional_expenses
   has_many :contact_topic_answers, dependent: :destroy
+  has_many :contact_topics, through: :contact_topic_answers
 
   after_save_commit ::CaseContactMetadataCallback.new
 
-  # Corresponds to the steps in the controller, so validations for certain columns can happen at those steps.
-  # These steps must be listed in order, have an html template in case_contacts/form, & be listed in the status enum
-  FORM_STEPS = %i[details notes expenses].freeze
-  # note: enum defines methods (active?) and scopes (.active, .not_active) for each member
-  # string values for wizard form steps, integer column would make db queries faster
+  # NOTE: 'notes' & 'expenses' statuses are no longer used. Could be removed from enum if
+  # existing records are migrated to started/details status (draft).
+  # NOTE: enum defines methods (active?) and scopes (.active, .not_active) for each member
   enum :status, {
     started: "started",
     active: "active",
@@ -72,10 +74,9 @@ def active_or_notes?
   end
 
   accepts_nested_attributes_for :additional_expenses, reject_if: :all_blank, allow_destroy: true
-  validates_associated :additional_expenses
 
-  accepts_nested_attributes_for :casa_case
-  accepts_nested_attributes_for :contact_topic_answers, update_only: true
+  accepts_nested_attributes_for :contact_topic_answers, allow_destroy: true,
+    reject_if: proc { |attrs| attrs["contact_topic_id"].blank? && attrs["value"].blank? }  # .notes sent without topic_id, but must have a value.
 
   scope :supervisors, ->(supervisor_ids = nil) {
     joins(:supervisor_volunteer).where(supervisor_volunteers: {supervisor_id: supervisor_ids}) if supervisor_ids.present?
@@ -267,21 +268,11 @@ def address_field_disabled?
   def volunteer
     if creator.is_a?(Volunteer)
       creator
-    elsif CasaCase.find(draft_case_ids.first).volunteers.count == 1
+    elsif draft_case_ids.first && CasaCase.find(draft_case_ids.first).volunteers.count == 1
       CasaCase.find(draft_case_ids.first).volunteers.first
     end
   end
 
-  def self.create_with_answers(casa_org, **kwargs)
-    create(kwargs).tap do |case_contact|
-      casa_org.contact_topics.active.each do |topic|
-        unless case_contact.contact_topic_answers << ContactTopicAnswer.new(contact_topic: topic)
-          case_contact.errors.add(:contact_topic_answers, "could not create topic #{topic&.question.inspect}")
-        end
-      end
-    end
-  end
-
   def self.options_for_sorted_by
     sorted_by_params.each.map { |option_pair| option_pair.reverse }
   end
@@ -293,12 +284,6 @@ def self.case_hash_from_cases(cases)
     end
   end
 
-  def form_steps
-    steps = FORM_STEPS.dup
-    steps.delete(:expenses) unless casa_org_any_expenses_enabled?
-    steps.freeze
-  end
-
   def casa_org_any_expenses_enabled?
     creator.casa_org.additional_expenses_enabled || creator.casa_org.show_driving_reimbursement
   end
diff --git a/app/models/contact_topic_answer.rb b/app/models/contact_topic_answer.rb
index 918d2f1bab..22db15c107 100644
--- a/app/models/contact_topic_answer.rb
+++ b/app/models/contact_topic_answer.rb
@@ -1,10 +1,15 @@
 class ContactTopicAnswer < ApplicationRecord
   belongs_to :case_contact
-  belongs_to :contact_topic
+  belongs_to :contact_topic, optional: true
 
-  validates :selected, inclusion: [true, false]
+  has_one :casa_case, through: :case_contact
+  has_one :casa_org, through: :case_contact
+  # case_contact.casa_org may be nil for draft contacts, use for fallback:
+  has_one :contact_creator, through: :case_contact, source: :creator
+  has_one :contact_creator_casa_org, through: :contact_creator, source: :casa_org
 
-  default_scope { joins(:contact_topic).order("contact_topics.id") }
+  validates :selected, inclusion: [true, false]
+  validates :contact_topic, presence: {if: ->(cta) { cta.value&.present? }, message: :must_be_selected}
 end
 
 # == Schema Information
@@ -17,7 +22,7 @@ class ContactTopicAnswer < ApplicationRecord
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
 #  case_contact_id  :bigint           not null
-#  contact_topic_id :bigint           not null
+#  contact_topic_id :bigint
 #
 # Indexes
 #
diff --git a/app/models/contact_type.rb b/app/models/contact_type.rb
index 02e34d58d5..f89cd1f75d 100644
--- a/app/models/contact_type.rb
+++ b/app/models/contact_type.rb
@@ -12,7 +12,7 @@ class ContactType < ApplicationRecord
     joins(:contact_type_group)
       .where(contact_type_groups: {casa_org: org})
   }
-
+  scope :active, -> { where(active: true) }
   scope :alphabetically, -> { order(:name) }
 end
 
diff --git a/app/policies/additional_expense_policy.rb b/app/policies/additional_expense_policy.rb
new file mode 100644
index 0000000000..7244a385a7
--- /dev/null
+++ b/app/policies/additional_expense_policy.rb
@@ -0,0 +1,34 @@
+class AdditionalExpensePolicy < ApplicationPolicy
+  class Scope < ApplicationPolicy::Scope
+    def resolve
+      case user
+      when CasaAdmin, Supervisor
+        scope.joins(:contact_creator).where(contact_creator: {casa_org: user.casa_org})
+      when Volunteer
+        scope.where(case_contact: user.case_contacts)
+      else
+        scope.none
+      end
+    end
+  end
+
+  def create?
+    case user
+    when Volunteer
+      user.case_contacts.exists?(record.case_contact_id)
+    when CasaAdmin, Supervisor
+      same_org?
+    else
+      false
+    end
+  end
+
+  alias_method :destroy?, :create?
+
+  private
+
+  def same_org?
+    record_org = record.casa_org || record.contact_creator_casa_org
+    user&.casa_org == record_org
+  end
+end
diff --git a/app/policies/case_contact_policy.rb b/app/policies/case_contact_policy.rb
index 9df9ce29d3..9763c82080 100644
--- a/app/policies/case_contact_policy.rb
+++ b/app/policies/case_contact_policy.rb
@@ -1,14 +1,18 @@
 class CaseContactPolicy < ApplicationPolicy
-  def is_creator_or_casa_admin?
-    is_admin? || is_creator?
+  def new?
+    is_creator? || admin_or_supervisor_same_org?
   end
 
-  def is_creator_or_supervisor_or_casa_admin?
-    is_creator? || admin_or_supervisor?
+  def show?
+    creator_or_admin?
+  end
+
+  def update?
+    creator_or_supervisor_or_admin?
   end
 
   def destroy?
-    admin_or_supervisor? || (is_creator? && is_draft?)
+    admin_or_supervisor_same_org? || (is_creator? && is_draft?)
   end
 
   def additional_expenses_allowed?
@@ -17,35 +21,33 @@ def additional_expenses_allowed?
   end
 
   alias_method :index?, :admin_or_supervisor_or_volunteer?
-  alias_method :new?, :admin_or_supervisor_or_volunteer?
-  alias_method :show?, :is_creator_or_casa_admin?
   alias_method :drafts?, :admin_or_supervisor?
-  alias_method :update?, :is_creator_or_supervisor_or_casa_admin?
-  alias_method :edit?, :is_creator_or_supervisor_or_casa_admin?
-  alias_method :restore?, :is_admin?
-
-  class Scope
-    attr_reader :user, :scope
-
-    def initialize(user, scope)
-      @user = user
-      @scope = scope
-    end
+  alias_method :edit?, :update?
+  alias_method :restore?, :is_admin_same_org?
 
+  class Scope < ApplicationPolicy::Scope
     def resolve
-      case @user
+      case user
       when CasaAdmin, Supervisor
-        scope.joins(:casa_case).where(casa_case: {casa_org: @user&.casa_org})
+        scope.joins(:creator).where(creator: {casa_org: user.casa_org})
       when Volunteer
-        scope.where(casa_case: CasaCase.actively_assigned_to(@user) + [nil], creator: @user)
+        scope.where(creator: user)
       else
-        raise "unrecognized user type #{@user.type}"
+        scope.none
       end
     end
   end
 
   private
 
+  def creator_or_admin?
+    is_creator? || is_admin_same_org?
+  end
+
+  def creator_or_supervisor_or_admin?
+    is_creator? || admin_or_supervisor_same_org?
+  end
+
   def is_draft?
     !record.active?
   end
@@ -53,4 +55,9 @@ def is_draft?
   def is_creator?
     record.creator == user
   end
+
+  def same_org?
+    record_org = record.casa_org || record.creator_casa_org
+    user&.casa_org_id == record_org&.id
+  end
 end
diff --git a/app/policies/contact_topic_answer_policy.rb b/app/policies/contact_topic_answer_policy.rb
new file mode 100644
index 0000000000..1d95b4777f
--- /dev/null
+++ b/app/policies/contact_topic_answer_policy.rb
@@ -0,0 +1,34 @@
+class ContactTopicAnswerPolicy < ApplicationPolicy
+  class Scope < ApplicationPolicy::Scope
+    def resolve
+      case user
+      when CasaAdmin, Supervisor
+        scope.joins(:contact_creator).where(contact_creator: {casa_org: user.casa_org})
+      when Volunteer
+        scope.where(case_contact: user.case_contacts)
+      else
+        scope.none
+      end
+    end
+  end
+
+  def create?
+    case user
+    when Volunteer
+      user.case_contacts.exists?(record.case_contact_id)
+    when CasaAdmin, Supervisor
+      same_org?
+    else
+      false
+    end
+  end
+
+  alias_method :destroy?, :create?
+
+  private
+
+  def same_org?
+    record_org = record.casa_org || record.contact_creator_casa_org
+    user&.casa_org == record_org
+  end
+end
diff --git a/app/values/case_contact_parameters.rb b/app/values/case_contact_parameters.rb
index b6125308d2..d5abc5abb6 100644
--- a/app/values/case_contact_parameters.rb
+++ b/app/values/case_contact_parameters.rb
@@ -17,7 +17,7 @@ def initialize(params)
         draft_case_ids: [],
         metadata: %i[create_another],
         additional_expenses_attributes: %i[id other_expense_amount other_expenses_describe _destroy],
-        contact_topic_answers_attributes: %i[id value selected]
+        contact_topic_answers_attributes: %i[id contact_topic_id value selected _destroy]
       )
 
     super(new_params)
@@ -35,6 +35,7 @@ def normalize_params(params)
     if params.dig(:case_contact, :miles_driven)
       params[:case_contact][:miles_driven] = convert_miles_driven(params)
     end
+    params[:case_contact][:notes] = params.dig(:case_contact, :notes).presence
 
     params
   end
diff --git a/app/views/casa_cases/show.html.erb b/app/views/casa_cases/show.html.erb
index cc895bdb95..74d4892ed7 100644
--- a/app/views/casa_cases/show.html.erb
+++ b/app/views/casa_cases/show.html.erb
@@ -3,7 +3,7 @@
   <div class="col-sm-12 form-header d-flex flex-wrap justify-content-between">
     <h1 class="pull-left my-4"><%= @casa_case.decorate.transition_aged_youth_icon %>CASA Case Details</h1>
     <div class="d-inline-flex flex-wrap my-4 gap-3">
-      <%- if policy(:case_contact).new? & @casa_case.active? %>
+      <%- if @casa_case.active? %>
         <%= link_to new_case_contact_path(case_contact: {casa_case_id: @casa_case.id}), class: "main-btn primary-btn btn-sm btn-hover pull-left" do %>
           <i class="lni lni-plus mr-10"></i>
           New Case Contact
diff --git a/app/views/case_contacts/form/_contact_topic_answer.html.erb b/app/views/case_contacts/form/_contact_topic_answer.html.erb
new file mode 100644
index 0000000000..91a9bb5ff1
--- /dev/null
+++ b/app/views/case_contacts/form/_contact_topic_answer.html.erb
@@ -0,0 +1,38 @@
+<div class="nested-form-wrapper mb-2"
+  data-new-record="<%= form.object.new_record? %>"
+  data-casa-nested-form-target="wrapper"
+  data-child-index="<%= form.options[:child_index] %>">
+  <div class="row gy-3">
+    <div class="col-12 col-md-4">
+      <%= form.label :contact_topic_id, "Discussion Topic", class: "form-label" %>
+      <%= form.select(:contact_topic_id,
+        select_options,
+        {include_blank: "Select a discussion topic"},
+        class: ["form-select", "contact-topic-id-select"],
+        data: {
+          action: "change->case-contact-form#onContactTopicSelect",
+          case_contact_form_target: "contactTopicSelect"
+        }
+      ) %>
+    </div>
+    <div class="col-12 col-md">
+      <%= form.label :value, "Discussion Notes", class: "form-label" %>
+      <%= form.text_area(
+        :value,
+        data: { action: "input->autosave#save" },
+        rows: 3,
+        class: ["form-control", "contact-topic-answer-input"],
+        placeholder: "Enter discussion notes here to be included in the court report. Refer to individuals by role, not by name."
+      ) %>
+    </div>
+    <div class="col-12 col-lg-auto d-flex align-items-end justify-content-end">
+      <button type="button"
+        data-action="casa-nested-form#confirmDestroyAndRemove"
+        class="btn btn-sm danger-btn-outline btn-hover">
+        Delete
+      </button>
+    </div>
+  </div>
+  <%= form.hidden_field(:id, value: form.object.id) %>
+  <%= form.hidden_field :_destroy %>
+</div>
diff --git a/app/views/case_contacts/form/_contact_topic_notes.html.erb b/app/views/case_contacts/form/_contact_topic_notes.html.erb
deleted file mode 100644
index 64f95fc7b5..0000000000
--- a/app/views/case_contacts/form/_contact_topic_notes.html.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-  <%= render "/shared/error_messages", resource: @case_contact %>
-  <%= form.fields_for(:contact_topic_answers) do |f| %>
-    <% topic = f.object.contact_topic %>
-    <% answer_id = topic.question.parameterize.underscore %>
-    <div class="card-style-1 pl-25 pr-25 mb-10">
-      <div class="d-flex justify-content-between <%= f.object.selected ? "mb-3" : nil %>"
-           data-action="click->icon-toggle#toggle"
-           data-bs-toggle="collapse"
-           data-bs-target="#<%= answer_id %>"
-           data-icon-toggle-target="margin"
-           data-controller="icon-toggle"
-           data-icon-toggle-icons-value='["lni-chevron-up", "lni-chevron-down"]'>
-           <h4 class="details__topics-label">
-             <%= f.label :question, "#{f.index + 1}. #{topic.question}" %> <span class="content-1">(optional)</span>
-           </h4>
-           <button class="bg-transparent border-0"
-                   type="button"
-                   id="<%= answer_id %>_button"
-                   aria-expanded="false">
-             <i class="lni <%= f.object.selected ? "lni-chevron-up" : "lni-chevron-down" %>" data-icon-toggle-target="icon"></i>
-           </button>
-      </div>
-
-      <div class="topic-questions collapse <%= f.object.selected ? "show" : nil %>"
-           id="<%= answer_id %>">
-           <span class="content-2">Court report questions:
-             <span class="content-3 collapse show read-more <%= answer_id %>_details">
-               ... <a class="content-2"
-                      href=".<%= answer_id %>_details"
-                      data-bs-toggle="collapse"
-                      role="button">[read more]</a>
-             </span>
-           </span>
-           <p class="pre-line content-3 collapse <%= answer_id %>_details"><%= topic.details %></p>
-           <span class="content-2 collapse <%= answer_id %>_details">
-             <a class="content-2"
-                 data-bs-toggle="collapse"
-                data-bs-parent=".topic-questions"
-                href=".<%= answer_id %>_details"
-                role="button">
-                [read less]
-             </a></span>
-           <div class="input-style-1 mt-3">
-             <%= f.text_area :value, :rows => 5, placeholder: "#{topic.question} notes", class: "form-control", data: { action: "input->autosave#save" } %>
-           </div>
-      </div>
-
-    </div>
-  <% end %>
diff --git a/app/views/case_contacts/form/_relevant_cases.html.erb b/app/views/case_contacts/form/_relevant_cases.html.erb
deleted file mode 100644
index 7796fab2f3..0000000000
--- a/app/views/case_contacts/form/_relevant_cases.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<p>Select the relevant cases below by searching or selecting from the dropdown menu.</p>
-<div id="draft-case-id-selector">
-  <%= render(Form::MultipleSelectComponent.new(
-    form: form,
-    name: :draft_case_ids,
-    options: options.decorate.map { |casa_case| casa_case.hash_for_multi_select },
-    selected_items: selected_items,
-    render_option_subtext: current_user.supervisor?
-  )) %>
-</div>
diff --git a/app/views/case_contacts/form/details.html.erb b/app/views/case_contacts/form/details.html.erb
index a0176df41e..6c96adb9e0 100644
--- a/app/views/case_contacts/form/details.html.erb
+++ b/app/views/case_contacts/form/details.html.erb
@@ -1,97 +1,297 @@
-<%= render(Form::TitleComponent.new(title: @case_contact.decorate.form_title, subtitle: "Contact details", step: @page, total_steps: @total_pages)) %>
+<div class="title-wrapper">
+  <h1 class="title my-4">
+    <%= @case_contact.decorate.form_title %>
+  </h1>
+</div>
+
+<div data-controller="autosave"
+  data-autosave-delay-value="2000"
+  data-autosave-good-alert-class="text-muted"
+  data-autosave-bad-alert-class="text-danger">
+  <%= form_with(
+    model: @case_contact,
+    url: wizard_path(nil, case_contact_id: @case_contact.id),
+    id: "case-contact-form",
+    data: {
+      controller: "case-contact-form",
+      "autosave-target": "form",
+    },
+    local: true
+  ) do |form| %>
 
-<div>
-  <%= form_with(model: @case_contact, url: wizard_path(nil, case_contact_id: @case_contact.id), local: true, id: "casa-contact-form", class: "component-validated-form") do |form| %>
     <%= render "/shared/error_messages", resource: @case_contact %>
 
-    <div class="card-style-1 pl-25 mb-10">
-      <h4 class="mb-20"><label for="case_contact_casa_case">1. Select the relevant <%= "case".pluralize(@casa_cases.count) %> for this contact <span class="red-letter">*</span></label></h4>
-      <div class="d-flex flex-column gap-4">
-        <%= form.hidden_field :draft_case_ids, multiple: true, value: nil %>
-        <%= render "relevant_cases", form: form, options: @casa_cases, selected_items: @selected_cases, casa_cases: @casa_cases %>
-      </div>
-    </div>
-    <div class="card-style-1 pl-25 pr-25 mb-10">
-      <div id="contact-type-form" class="d-flex flex-column gap-4">
-        <h4 id="contact-type-label"><label>2. Select All Contact Types</label><span class="red-letter"> *</span></h4>
-        <%= render "contact_types", form: form, options: @contact_types, selected_items: @selected_contact_type_ids, casa_cases: @casa_cases %>
-      </div>
-    </div>
+    <!-- DETAILS -->
+    <section id="contact-form-details">
+      <h2>Details</h2>
 
-    <div id="enter-contact-details" class="card-style-1 pl-25 mb-10">
-      <h4 class="mb-3"><label>3. Record contact details</label><span class="red-letter"> *</span></h4>
-      <div class="">
-        <h5 classs="mb-3"><label>a. Was contact made?</label></h5>
-        <div class="form-check radio-style mb-20">
-          <%= form.radio_button :contact_made, true,
-            required: true,
-            class: ["form-check-input", "case-contacts-form-checkbox"] %>
-          <%= form.label "Yes", class: "form-check-label",
-            for: "case_contact_contact_made_true" %>
+      <div class="row">
+        <!-- RELEVANT CASES -->
+        <div class="col">
+          <h3>
+            <label class="form-label" for="case_contact_draft_case_ids">
+              Relevant Case(s)<span class="red-letter">*</span>
+            </label>
+          </h3>
+          <div id="draft-case-id-selector">
+            <%= render(Form::MultipleSelectComponent.new(
+              form: form,
+              name: :draft_case_ids,
+              options: @casa_cases.decorate.map { |casa_case| casa_case.hash_for_multi_select },
+              selected_items: @case_contact.draft_case_ids,
+              render_option_subtext: current_user.supervisor?,
+              placeholder_term: "case(s)"
+            )) %>
+          </div>
         </div>
-        <div class="form-check radio-style mb-20">
-          <%= form.radio_button :contact_made, false,
+
+        <!--DATE-->
+        <div class="col">
+          <h3>
+            <%= form.label :occurred_at, class: "form-label" do %>
+              Contact Date<span class="red-letter">*</span>
+            <% end %>
+          </h3>
+          <% min_date = CaseContact::MINIMUM_DATE %>
+          <% current_date = Time.zone.today %>
+          <% initial_value = @case_contact.occurred_at&.to_date %>
+          <%= form.date_field(:occurred_at,
             required: true,
-            class: ["form-check-input", "case-contacts-form-checkbox"] %>
-          <%= form.label "No", class: "form-check-label",
-            for: "case_contact_contact_made_false" %>
+            max: (current_date + 1.day).to_fs(:iso8601),
+            min: min_date.to_fs(:iso8601),
+            class: "form-control") %>
         </div>
       </div>
 
-      <div class="field contact-medium form-group">
-        <h5 classs="mb-3"><label>b. How was contact made?</label></h5>
+      <!--CONTACT TYPE-->
+      <h3 class="mb-2">
+        Contact Type(s)<span class="red-letter">*</span>
+      </h3>
+      <div id="contact-form-types" class="mb-3">
+        <% casa_case_ids = @casa_cases.pluck(:id) %>
+        <% @grouped_contact_types.each do |group_name, contact_types| %>
+          <fieldset class="form-group">
+            <legend><%= group_name %></legend>
+            <%= form.collection_check_boxes(:contact_type_ids, contact_types, :id, :name) do |b| %>
+              <div class="form-check">
+                <%= b.check_box(class: ["form-check-input", "contact-form-type-checkbox"]) %>
+                <%= b.label(class: "form-check-label") %>
+                <small>
+                  <%= b.object.last_time_used_with_cases(casa_case_ids) %>
+                </small>
+              </div>
+            <% end %>
+          </fieldset>
+        <% end %>
+      </div>
+
+      <!--CONTACT MADE-->
+      <div class="form-check mb-20">
+        <%= form.check_box :contact_made, class: "form-check-input" %>
+        <%= form.label :contact_made, class: "form-check-label" do %>
+          <h3>Contact was made</h3>
+        <% end %>
+      </div>
+
+      <!--MEDIUM-->
+      <fieldset id="contact-medium" class="form-group mb-20">
+        <legend>
+          <h3>Contact Medium<span class="red-letter">*</span></h3>
+        </legend>
         <%= form.collection_radio_buttons(:medium_type, contact_mediums, 'value', 'label') do |b| %>
-          <div class="form-check radio-style mb-20">
-            <%= b.radio_button(class: ["form-check-input", "case-contacts-form-checkbox"]) %>
+          <div class="form-check">
+            <%= b.radio_button(class: "form-check-input") %>
             <%= b.label(class: "form-check-label") %>
           </div>
         <% end %>
-      </div>
+      </fieldset>
 
-      <div class="pr-50">
-        <h5 class="mb-3"><%= form.label :occurred_at, "c. Date of contact" %></h5>
-        <div class="input-style-1">
-          <% min_date = CaseContact::MINIMUM_DATE %>
-          <% current_date = Date.current %>
-          <% initial_value = @case_contact.occurred_at&.to_date || current_date %>
-          <%= form.date_field :occurred_at,
-            value: initial_value.to_fs(:iso8601),
-            max: current_date.to_fs(:iso8601),
-            min: min_date.to_fs(:iso8601),
-            class: "form-control card-style-1" %>
-        </div>
-      </div>
+      <!--DURATION-->
+      <h3 class="mb-3">Contact Duration</h3>
+      <%= render(Form::HourMinuteDurationComponent.new(
+        form: form, hour_value: duration_hours(@case_contact), minute_value: duration_minutes(@case_contact))
+      ) %>
+    </section>
 
-      <div class="pr-50 ">
-        <h5 class="mb-3"><label>d. Duration of contact</label></h5>
-        <%= render(Form::HourMinuteDurationComponent.new(form: form, hour_value: duration_hours(@case_contact), minute_value: duration_minutes(@case_contact))) %>
-      </div>
-    </div>
+    <!--NOTES (CONTACT TOPIC ANSWERS)-->
+    <section id="contact-form-notes"
+      data-controller="casa-nested-form"
+      data-casa-nested-form-route-value="/contact_topic_answers"
+      data-casa-nested-form-parent-name-value="case_contact"
+      data-casa-nested-form-parent-id-value="<%= @case_contact.id %>"
+      data-casa-nested-form-model-name-value="contact_topic_answer">
+      <h2>Notes</h2>
+
+      <% if @contact_topics.empty? %>
+        <p class="mb-5"><small>
+        <% if current_user.casa_admin? %>
+          Visit <%= link_to "Manage Case Contact Topics", edit_casa_org_path(current_organization, anchor: "case-contact-topics") %> to set your organization Court report topics.
+        <% else %>
+          Your organization has not set any Court Report Topics yet. Contact your admin to learn more.
+        <% end %>
+        </small></p>
+      <% else %>
+        <% select_options = @contact_topics.map { |topic| [topic.question, topic.id] } %>
 
-<div class="card-style-1 pl-25 pr-25 mb-10">
-  <h4 class="mb-20 details__topics-label">Court Report Topics <span class="content-1">(optional)</span></h4>
-  <div>
-    <% if @case_contact.contact_topic_answers.any? %>
-      <%= form.fields_for(:contact_topic_answers) do |f| %>
-        <div class="form-check checkbox-style mb-10 ml-5">
-          <%= f.check_box :selected, class: ["form-check-input", "casa-case-id"] %>
-          <%= f.label :selected, f.object.contact_topic.question, class: "form-check-label" %>
+        <template data-casa-nested-form-target="template">
+          <%= form.fields_for :contact_topic_answers, ContactTopicAnswer.new, child_index: "NEW_RECORD" do |topic_fields| %>
+            <%= render("contact_topic_answer", form: topic_fields, select_options:) %>
+          <% end %>
+        </template>
+
+        <% if form.object.contact_topic_answers.any? %>
+          <%= form.fields_for :contact_topic_answers do |topic_fields| %>
+            <%= render("contact_topic_answer", form: topic_fields, select_options:) %>
+          <% end %>
+        <% end %>
+
+        <div data-casa-nested-form-target="target"></div>
+
+        <button type="button"
+          class="btn btn-sm btn-link"
+          data-case-contact-form-target="addTopicButton"
+          data-action="casa-nested-form#addAndCreate">
+          + Add Another Discussion Topic
+        </button>
+      <% end %>
+
+      <% if form.object.notes.present? || @contact_topics.empty? %>
+        <div class="col mb-3">
+          <%= form.label :notes, "Additional Notes", class: "form-label" %>
+          <%= form.text_area(
+            :notes,
+            data: { action: "input->autosave#save" },
+            rows: 5,
+            class: ["form-control"],
+          ) %>
         </div>
       <% end %>
-    <% elsif current_user.casa_admin? %>
-      Visit <%= link_to "Manage Case Contact Topics", edit_casa_org_path(current_user.casa_org_id) %> to set your organization Court report topics.
-    <% else %>
-      Your organization has not set any Court Report Topics yet. Contact your admin to learn more.
+
+      <small role="alert"
+        class="d-block invisible"
+        data-autosave-target="alert alert-light">
+        No changes have been saved.
+      </small>
+    </section>
+
+    <% org_driving_reimbursement = current_organization.show_driving_reimbursement %>
+    <% show_driving_reimbursement = org_driving_reimbursement && show_volunteer_reimbursement(@casa_cases) %>
+    <% org_additional_expenses = current_organization.additional_expenses_enabled %>
+    <% show_additional_expenses = org_additional_expenses && Pundit.policy(current_user, @case_contact).additional_expenses_allowed? %>
+    <% if show_driving_reimbursement %>
+      <!-- REIMBURSMENT -->
+      <section id="contact-form-reimbursement">
+        <h2>Reimbursement</h2>
+        <% if Flipper.enabled?(:reimbursement_warning, current_organization) %>
+          <article class="card-style-1 p-3 mb-10" style="background-color: #fcab553d;">
+            <h4 class="mb-3"><label>Volunteers are eligible to be reimbursed for case-related travel.</label></h4>
+            <span> Volunteers are reimbursed at the federal mileage rate.</span>
+            <br>
+            <span>Please note that there is a $35.00 per month cap per volunteer for your mileage.</span>
+            <span>We aim to mail your reimbursement to you via check within 14-28 business days of your request for reimbursement.</span>
+          </article>
+        <% end %>
+
+        <div class="form-check mb-3">
+          <%= form.check_box(:want_driving_reimbursement,
+            class: "form-check-input",
+            data: {
+              case_contact_form_target: "wantDrivingReimbursement",
+              action: "click->case-contact-form#setReimbursementFormVisibility",
+            }
+          ) %>
+          <%= form.label :want_driving_reimbursement, class: "form-check-label" do %>
+            <h3>Request travel or other reimbursement</h3>
+          <% end %>
+        </div>
+
+        <!-- DRIVING REIMBURSEMENT -->
+        <div data-case-contact-form-target="reimbursementForm" class="d-none">
+          <div class="row py-2">
+            <div class="col-md-4">
+              <%= form.label :miles_driven, class: "form-label" do %>
+                Total Miles Driven<span class="red-letter">*</span>
+              <% end %>
+              <%= form.number_field(:miles_driven,
+                min: "0", max: 10000, placeholder: "0",
+                class: "form-control",
+                data: { case_contact_form_target: "milesDriven" },
+              ) %>
+            </div>
+
+            <div class="col">
+              <%= form.label :volunteer_address, class: "form-label" do %>
+                Mailing Address for Reimbursement Check<span class="red-letter">*</span>
+              <% end %>
+              <%= form.text_area(:volunteer_address,
+                value: @case_contact.decorate.address_of_volunteer,
+                disabled: @case_contact.address_field_disabled?,
+                placeholder: "Enter mailing address",
+                class: "form-control",
+                data: { case_contact_form_target: "volunteerAddress" },
+              ) %>
+              <% if @case_contact.address_field_disabled? %>
+                <small class="text-danger">
+                  <%= @case_contact.decorate.ambiguous_volunteer_address_message %>
+                </small>
+              <% end %>
+            </div>
+          </div>
+
+          <% if show_additional_expenses %>
+            <!-- ADDITIONAL EXPENSES -->
+            <div id="contact-form-expenses"
+              data-controller="casa-nested-form"
+              data-casa-nested-form-route-value="/additional_expenses"
+              data-casa-nested-form-parent-name-value="case_contact"
+              data-casa-nested-form-parent-id-value="<%= @case_contact.id %>"
+              data-casa-nested-form-model-name-value="additional_expense">
+
+              <template data-casa-nested-form-target="template">
+                <%= form.fields_for :additional_expenses, AdditionalExpense.new, child_index: "NEW_RECORD" do |expense_fields| %>
+                  <%= render "shared/additional_expense_form", form: expense_fields %>
+                <% end %>
+              </template>
+
+              <% if form.object.additional_expenses.any? %>
+                <%= form.fields_for :additional_expenses do |expense_fields| %>
+                  <%= render "shared/additional_expense_form", form: expense_fields %>
+                <% end %>
+              <% end %>
+
+              <div data-casa-nested-form-target="target"></div>
+
+              <button type="button" class="btn btn-sm btn-link"
+                data-action="casa-nested-form#addAndCreate">
+                + Add Another Expense
+              </button>
+            </div>
+          <% end %>
+        </div>
+
+        <small role="alert"
+          class="d-block invisible"
+          data-autosave-target="alert alert-light">
+          No changes have been saved.
+        </small>
+      </section>
     <% end %>
-  </div>
-</div>
 
-    <div class="actions mb-10 case-contacts-form-buttons">
-      <%= link_to leave_case_contacts_form_path, class: "btn-sm main-btn #{@case_contact.draft_case_ids.empty? ? 'danger' : 'primary'}-btn-outline btn-hover", data: { controller: "alert", "action": "alert#confirm", "alert-ignore-value": !@case_contact.draft_case_ids.empty?, "alert-title-value": "Discard draft?", "alert-message-value": "Are you sure? If you don't save and continue to the next step, this draft will not be recoverable." } do %>
-        Back
-      <% end %>
+    <div id="contact-form-action-buttons" class="actions mb-10">
+      <div class="pt-1">
+        <%= form.fields_for :metadata do |metadata_form| %>
+          <%= metadata_form.check_box :create_another, class: "form-check-input" %>
+          <%= metadata_form.label :create_another, class: "form-check-label d-inline align-bottom" do %>
+            Create Another
+            <i class="lni lni-question-circle" data-toggle="tooltip" data-placement="top" title="Start a new contact for the same case(s) after submitting.">
+            </i>
+          <% end %>
+        <% end %>
+      </div>
 
-      <%= render(Form::SubmitButtonComponent.new(last_step: @case_contact.form_steps.last, current_step: :details)) %>
+      <%= button_tag type: "submit", class: "btn-sm main-btn primary-btn btn-hover" do %>
+        <i class="lni lni-checkmark-circle mr-5"></i>Submit
+      <% end %>
     </div>
   <% end %>
 </div>
diff --git a/app/views/case_contacts/form/expenses.html.erb b/app/views/case_contacts/form/expenses.html.erb
deleted file mode 100644
index c6c104b552..0000000000
--- a/app/views/case_contacts/form/expenses.html.erb
+++ /dev/null
@@ -1,118 +0,0 @@
-<%= render(Form::TitleComponent.new(title: @case_contact.decorate.form_title, subtitle: "Contact expenses", step: @page, total_steps: @total_pages)) %>
-
-<div>
-  <%= form_with(model: @case_contact, data: { controller: "nested-form", nested_form_wrapper_selector_value: ".nested-form-wrapper"}, url: wizard_path(nil, case_contact_id: @case_contact.id), local: true, id: "casa-contact-form", class: "component-validated-form") do |form| %>
-    <%= render "/shared/error_messages", resource: @case_contact %>
-
-    <% if Flipper.enabled?(:reimbursement_warning, current_organization) %>
-      <article class="card-style-1 pl-25 mb-10 pr-50" style="background-color: #fcab553d;">
-        <h4 class="mb-3"><label>Volunteers are eligible to be reimbursed for case-related travel.</label></h4>
-        <span> Volunteers are reimbursed at the federal mileage rate.</span>
-        <br>
-        <span>Please note that there is a $35.00 per month cap per volunteer for your mileage.</span>
-        <span>We aim to mail your reimbursement to you via check within 14-28 business days of your request for reimbursement.</span>
-      </article>
-    <% end %>
-
-    <div class="card-style-1 pl-25 mb-10 pr-50">
-      <div class="d-flex gap-1">
-        <h4 class="mb-3"><label>1. Travel Details</label></h4>
-        <p class="text-dark">(optional)</p>
-      </div>
-
-      <% if current_organization.show_driving_reimbursement && show_volunteer_reimbursement(@casa_cases) %>
-        <div class="field want-driving-reimbursement form-group">
-          <h5 class="mb-3"><label>a. Do you require driving reimbursement for this case contact?</label></h5>
-          <div class="form-check radio-style mb-20">
-            <%= form.radio_button :want_driving_reimbursement, true,
-              required: false,
-              class: ["form-check-input", "case-contacts-form-checkbox"] %>
-            <%= form.label "Yes", class: "form-check-label",
-              for: "case_contact_want_driving_reimbursement_true" %>
-          </div>
-          <div class="form-check radio-style mb-20">
-            <%= form.radio_button :want_driving_reimbursement, false,
-              required: false,
-              class: ["form-check-input", "case-contacts-form-checkbox"] %>
-            <%= form.label "No", class: "form-check-label",
-              for: "case_contact_want_driving_reimbursement_false" %>
-          </div>
-        </div>
-
-        <div class="field miles-driven form-group">
-          <h5 class="mb-3"><%= form.label :miles_driven, "b. Total miles driven" %></h5>
-          <div class="input-style-1">
-            <% if form.object.new_record? && @case_contact.miles_driven == 0 %>
-              <input class="form-control" min="0" max="10000" type="number" value="0" name="case_contact[miles_driven]" autocomplete="off" id="case_contact_miles_driven">
-            <% else %>
-              <%= form.number_field :miles_driven, class: "form-control", min: "0", max: 10000, placeholder: "0" %>
-            <% end %>
-          </div>
-        </div>
-
-        <div class="field volunteer-address form-group">
-          <h5 class="mb-3"><label>c. Your current address (for reimbursement check)</label></h5>
-          <div class="input-style-1 mb-0">
-            <%= form.text_field :volunteer_address, value: @case_contact.decorate.address_of_volunteer, disabled: @case_contact.address_field_disabled?, class: "input-style-1" %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-
-    <% if Pundit.policy(current_user, @case_contact).additional_expenses_allowed? %>
-      <div class="card-style-1 pl-25 mb-10 pr-50">
-        <div class="d-flex gap-1">
-          <h4 class="mb-3"><label>2. Other Expenses</label></h4>
-          <p class="text-dark">(optional)</p>
-        </div>
-
-        <div class="other-expenses">
-          <ol>
-            <% @case_contact.decorate.additional_expenses_count %>
-            <% if form.object.additional_expenses.any? %>
-              <% form.object.additional_expenses.each do |expense| %>
-                <%= form.fields_for :additional_expenses, expense do |f| %>
-                  <%= render "shared/additional_expense_form", form: f, new_record: false %>
-                  <% end %>
-                <% end %>
-            <% else %>
-              <%= form.fields_for :additional_expenses, AdditionalExpense.new do |f| %>
-                <%= render "shared/additional_expense_form", form: f, new_record: true %>
-              <% end %>
-            <% end %>
-            <template data-nested-form-target="template">
-              <%= form.fields_for :additional_expenses, AdditionalExpense.new, child_index: "NEW_RECORD" do |f| %>
-                <%= render "shared/additional_expense_form", form: f %>
-              <% end %>
-            </template>
-            <div data-nested-form-target="target"></div>
-          </ol>
-
-          <button type="button" class="btn-sm main-btn primary-btn-outline btn-hover" data-action="nested-form#add" id="add-another-expense">
-            <i class="lni lni-plus mr-10"></i> Add Another Expense
-          </button>
-
-        </div>
-      </div>
-    <% end %>
-
-    <div class="actions mb-10 case-contacts-form-buttons">
-      <div class="checkbox-style pt-1">
-        <%= form.fields_for :metadata do |metadata_form| %>
-          <%= metadata_form.check_box :create_another, class: "form-check-input" %>
-          <%= metadata_form.label :create_another, class: "form-check-label d-inline align-bottom" do %>
-            Create Another
-            <i class="lni lni-question-circle" data-toggle="tooltip" data-placement="top"
-              title="Start a new contact for the same case(s) after submitting.">
-            </i>
-          <% end %>
-        <% end %>
-      </div>
-      <%= link_to previous_wizard_path(case_contact_id: @case_contact.id), class: "btn-sm main-btn primary-btn-outline btn-hover" do %>
-        Back
-      <% end %>
-
-      <%= render(Form::SubmitButtonComponent.new(last_step: @case_contact.form_steps.last, current_step: :expenses)) %>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/case_contacts/form/notes.html.erb b/app/views/case_contacts/form/notes.html.erb
deleted file mode 100644
index 4f4309bf7d..0000000000
--- a/app/views/case_contacts/form/notes.html.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<div data-controller="autosave" data-autosave-good-alert-class="text-muted" data-autosave-bad-alert-class="text-danger">
-  <%= render(Form::TitleComponent.new(title: @case_contact.decorate.form_title, subtitle: "Contact notes", step: @page, total_steps: @total_pages, notes: @case_contact.decorate.form_page_notes[:notes], autosave: true)) %>
-
-  <div>
-    <%= form_with(model: @case_contact, url: wizard_path(nil, case_contact_id: @case_contact.id), id: "casa-contact-form", class: "component-validated-form", data: { "turbo-action": "advance", "autosave-target": "form" }) do |form| %>
-      <%= render "contact_topic_notes", form: %>
-      <div class="card-style-1 pl-25 pr-25 mb-10">
-        <div class="d-flex justify-content-between mb-3"
-             data-icon-toggle-target="margin"
-             data-action="click->icon-toggle#toggle"
-             data-bs-toggle="collapse"
-             data-controller="icon-toggle"
-             data-bs-target="#additional-notes"
-             data-icon-toggle-icons-value='["lni-chevron-up", "lni-chevron-down"]'>
-          <h4 class=""><%= form.label :notes, "#{@case_contact.contact_topic_answers.count + 1}. Additional notes (optional)" %></h4>
-          <button class="bg-transparent border-0"
-                  type="button"
-                  aria-expanded="false">
-            <i id="additional-notes-icon" class="lni lni-chevron-up" data-icon-toggle-target="icon"></i>
-          </button>
-        </div>
-
-        <div class="collapse show" id="additional-notes">
-          <p class="mb-3">
-            Include any additional comments or notes that may assist in future case tracking or reporting.
-          </p>
-          <div class="input-style-1">
-            <%= form.text_area :notes, :rows => 5, placeholder: "Additional notes", class: "form-control", data: { action: "input->autosave#save" } %>
-          </div>
-        </div>
-      </div>
-
-      <div class="actions mb-10 case-contacts-form-buttons">
-        <%= link_to previous_wizard_path(case_contact_id: @case_contact.id), class: "btn-sm main-btn primary-btn-outline btn-hover" do %>
-          Back
-        <% end %>
-        <%= render(Form::SubmitButtonComponent.new(last_step: @case_contact.form_steps.last, current_step: :notes)) %>
-      </div>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/shared/_additional_expense_form.html.erb b/app/views/shared/_additional_expense_form.html.erb
index 3d19c73ee4..f3fc0de909 100644
--- a/app/views/shared/_additional_expense_form.html.erb
+++ b/app/views/shared/_additional_expense_form.html.erb
@@ -1,28 +1,38 @@
-<div class="nested-form-wrapper">
-    <li>
-      <div class="expense-container row" data-index="<%= form.index %>">
-        <div class="input-style-1 col-sm-3">
-          <h5><%= form.label :additional_expense, "Expense amount" %></h5>
-          <div class="input-group">
-            <span class="dollar-sign">
-              <%= form.number_field :other_expense_amount,
-                value: number_with_precision(form.object.other_expense_amount, precision: 2),
-                placeholder: "0",
-                class: "form-control other-expense-amount",
-                min: "0", max: 1000, step: 0.01 %>
-            </span>
-          </div>
-        </div>
-        <div class="input-style-1 col">
-          <h5><%= form.label :other_expenses_describe, "Expense details" %></h5>
-          <%= form.text_field :other_expenses_describe,
-            placeholder: "Enter additional details",
-            class: "form-control other-expenses-describe" %>
-        </div>
-          <div class="input-style-1 col">
-            <button type="button" class="align-self-center main-btn danger-btn btn-hover btn-sm remove-expense-button mt-15" data-action="nested-form#remove"> Delete</button>
-        </div>
+<div class="nested-form-wrapper mb-2"
+  data-new-record="<%= form.object.new_record? %>"
+  data-casa-nested-form-target="wrapper"
+  data-child-index="<%= form.options[:child_index] %>">
+  <div class="row gy-3">
+    <div class="col-12 col-md-4">
+      <%= form.label :other_expense_amount, "Other Expense Amount", class: "form-label" %>
+      <div class="input-group">
+        <span class="input-group-text">$</span>
+        <%= form.number_field(:other_expense_amount,
+          value: number_with_precision(form.object.other_expense_amount, precision: 2),
+          placeholder: "0", min: "0", max: 1000, step: 0.01,
+          class: ["form-control", "expense-amount-input"],
+        ) %>
       </div>
-    </li>
-    <%= form.hidden_field :_destroy %>
+    </div>
+    <div class="cl-12 col-md">
+      <%= form.label :other_expenses_describe, class: "form-label" do %>
+        Other Expense Details<span class="red-letter">*</span>
+      <% end %>
+      <%= form.text_area(:other_expenses_describe,
+          placeholder: "Enter other expense details",
+          class: ["form-control", "expense-describe-input"],
+          data: { action: "input->autosave#save" },
+      ) %>
+    </div>
+    <div class="col-12 col-md-auto d-flex align-items-center justify-content-end">
+      <button type="button"
+        class="remove-expense-button btn btn-sm danger-btn-outline btn-hover"
+        data-action="casa-nested-form#destroyAndRemove">
+        Delete
+      </button>
+    </div>
+
+    <%= form.hidden_field :id, value: form.object.id %>
+    <%= form.hidden_field :_destroy, data: {case_contact_form_target: "expenseDestroy"} %>
+  </div>
 </div>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 67d0528ae1..c98e2c0538 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -303,7 +303,7 @@
   # should add them to the navigational formats lists.
   #
   # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ['*/*', :html]
+  config.navigational_formats = ["*/*", :html]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
   config.sign_out_via = :get
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3e42aaf7a0..f6b3763aaf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -32,6 +32,9 @@
 en:
   activerecord:
     attributes:
+      additional_expense:
+        other_expenses_amount: Amount
+        other_expenses_describe: Description
       case_contact:
         case_contact_contact_types:
           one: Contact Type
@@ -39,13 +42,19 @@ en:
         contact_types:
           one: Contact Type
           other: Contact Types
+        contact_topic_answers:
+          one: Discussion Topic
+          other: Discussion Topics
         draft_case_ids:
           one: CASA Case
           other: CASA Cases
         occurred_at: Date
       case_contact/additional_expenses:
-        other_expenses_amount: Expense amount
-        other_expenses_describe: Expense description
+        other_expense_amount: Other Expense Amount
+        other_expenses_describe: Other Expense Details
+      case_contact/contact_topic_answers:
+        contact_topic: Discussion Topic
+        value: Discussion Notes
     errors:
       messages:
         cant_be_future: can't be in the future
diff --git a/config/routes.rb b/config/routes.rb
index 95b62d5c59..35b37877ae 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -96,6 +96,8 @@
     end
   end
 
+  resources :contact_topic_answers, only: %i[create destroy]
+
   resources :reports, only: %i[index]
   get :export_emails, to: "reports#export_emails"
 
@@ -191,6 +193,8 @@
   end
   resources :case_court_orders, only: %i[destroy]
 
+  resources :additional_expenses, only: %i[create destroy]
+
   namespace :all_casa_admins do
     resources :casa_orgs, only: [:new, :create, :show] do
       resources :casa_admins, only: [:new, :create, :edit, :update] do
diff --git a/db/migrate/20241017050129_remove_contact_topic_answer_contact_topic_id_null_constraint.rb b/db/migrate/20241017050129_remove_contact_topic_answer_contact_topic_id_null_constraint.rb
new file mode 100644
index 0000000000..6bb306db4d
--- /dev/null
+++ b/db/migrate/20241017050129_remove_contact_topic_answer_contact_topic_id_null_constraint.rb
@@ -0,0 +1,5 @@
+class RemoveContactTopicAnswerContactTopicIdNullConstraint < ActiveRecord::Migration[7.2]
+  def change
+    change_column_null(:contact_topic_answers, :contact_topic_id, true)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e4ba1f6685..d56cb46c86 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_07_16_194609) do
+ActiveRecord::Schema[7.2].define(version: 2024_10_17_050129) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -251,7 +251,7 @@
   create_table "contact_topic_answers", force: :cascade do |t|
     t.text "value"
     t.bigint "case_contact_id", null: false
-    t.bigint "contact_topic_id", null: false
+    t.bigint "contact_topic_id"
     t.boolean "selected", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
diff --git a/spec/components/form/submit_button_component_spec.rb b/spec/components/form/submit_button_component_spec.rb
deleted file mode 100644
index e84f99b064..0000000000
--- a/spec/components/form/submit_button_component_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-RSpec.describe Form::SubmitButtonComponent, type: :component do
-  before(:each) do
-    render_inline(described_class.new(last_step:, current_step:))
-  end
-
-  context "when last step is equal to current step" do
-    let(:last_step) { :notes }
-    let(:current_step) { :notes }
-    it "renders Submit button" do
-      expect(page).to have_content("Submit")
-    end
-  end
-
-  context "when last step is not equal to current step" do
-    let(:last_step) { :notes }
-    let(:current_step) { :expenses }
-    it "renders Save and continue button" do
-      expect(page).to have_content("Save and Continue")
-    end
-  end
-end
diff --git a/spec/components/form/title_component_spec.rb b/spec/components/form/title_component_spec.rb
deleted file mode 100644
index 3c1cfe0c82..0000000000
--- a/spec/components/form/title_component_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-RSpec.describe Form::TitleComponent, type: :component do
-  let(:title) { "Record case contact" }
-  let(:subtitle) { "Enter notes" }
-  let(:step) { nil }
-  let(:total_steps) { nil }
-  let(:notes) { nil }
-  let(:autosave) { nil }
-
-  before(:each) do
-    render_inline(described_class.new(title: title, subtitle: subtitle, step: step, total_steps: total_steps, notes: notes, autosave: autosave))
-  end
-
-  context "by default" do
-    it "renders component" do
-      expect(page).to have_css "h1", text: title
-      expect(page).to have_css "h2", text: subtitle
-    end
-
-    it "does not render progress" do
-      expect(page).not_to have_css "div[class='progress']"
-    end
-
-    it "does not render autosave alert div" do
-      expect(page).not_to have_css "small[data-autosave-target='alert']"
-    end
-  end
-
-  context "with step and total_steps" do
-    let(:step) { 2 }
-    let(:total_steps) { 5 }
-
-    it "renders progress bar" do
-      expect(page).to have_css "div[class='progress']"
-    end
-
-    it "renders steps in a phrase" do
-      expect(page).to have_css "p", text: "Step 2 of 5"
-    end
-
-    it "renders progress bar with percentage" do
-      expect(page).to have_css "div[style='width: 40.0%']"
-    end
-  end
-
-  context "with notes" do
-    let(:notes) { "Some notes to display" }
-
-    it "renders notes" do
-      expect(page).to have_css "p", text: notes
-    end
-  end
-
-  context "with autosave" do
-    let(:autosave) { true }
-
-    it "renders autosave alert div" do
-      expect(page).to have_css "small[data-autosave-target='alert']"
-    end
-  end
-end
diff --git a/spec/controllers/emancipations_controller_spec.rb b/spec/controllers/emancipations_controller_spec.rb
index e50ab1bc65..054f37bf28 100644
--- a/spec/controllers/emancipations_controller_spec.rb
+++ b/spec/controllers/emancipations_controller_spec.rb
@@ -17,26 +17,31 @@
     allow(controller).to receive(:current_user).and_return(volunteer)
   end
 
-  describe "#not_authorized" do
-    subject(:show) { get :show, params: {casa_case_id: casa_case_id, format: :json} }
+  describe "show" do
+    context "json request" do
+      subject(:show) { get :show, params: {casa_case_id: casa_case_id, format: :json} }
 
-    before do
-      allow_any_instance_of(Volunteer).to receive(:casa_org).and_return nil
-    end
+      context "not_authorized" do
+        before do
+          allow_any_instance_of(Volunteer).to receive(:casa_org).and_return nil
+        end
 
-    it "will do redirect to the root" do
-      expect(show).to redirect_to(root_url)
-    end
+        it "responds unauthorized" do
+          show
+          expect(response).to have_http_status(:unauthorized)
+        end
 
-    context "the backtrace ends in 'save'" do
-      before do
-        allow_any_instance_of(Organizational::UnknownOrganization).to receive(:backtrace).and_return(["", "", "save'"])
-      end
+        context "the backtrace ends in 'save'" do
+          before do
+            allow_any_instance_of(Organizational::UnknownOrganization).to receive(:backtrace).and_return(["", "", "save'"])
+          end
 
-      it "will render the correct json message" do
-        show
-        expect(response).to have_http_status(:unauthorized)
-        expect(response.body).to eq({error: "Sorry, you are not authorized to perform this action. Did the session expire?"}.to_json)
+          it "will render the correct json message" do
+            show
+            expect(response).to have_http_status(:unauthorized)
+            expect(response.body).to eq({error: "Sorry, you are not authorized to perform this action. Did the session expire?"}.to_json)
+          end
+        end
       end
     end
   end
diff --git a/spec/lib/tasks/data_post_processors/case_contact_populator_spec.rb b/spec/lib/tasks/data_post_processors/case_contact_populator_spec.rb
index 2c181d4b29..92dd6f62b8 100644
--- a/spec/lib/tasks/data_post_processors/case_contact_populator_spec.rb
+++ b/spec/lib/tasks/data_post_processors/case_contact_populator_spec.rb
@@ -15,7 +15,7 @@
   end
 
   it "does nothing if there are no contact types" do
-    case_contact = create(:case_contact, contact_types: [])
+    case_contact = create(:case_contact, contact_types: [], status: "started")
 
     described_class.populate
 
diff --git a/spec/models/additional_expense_spec.rb b/spec/models/additional_expense_spec.rb
index 83155512c1..74d4ab6f89 100644
--- a/spec/models/additional_expense_spec.rb
+++ b/spec/models/additional_expense_spec.rb
@@ -2,4 +2,19 @@
 
 RSpec.describe AdditionalExpense, type: :model do
   it { is_expected.to belong_to(:case_contact) }
+  it { is_expected.to have_one(:casa_case).through(:case_contact) }
+  it { is_expected.to have_one(:casa_org).through(:case_contact) }
+  it { is_expected.to have_one(:contact_creator).through(:case_contact) }
+  it { is_expected.to have_one(:contact_creator_casa_org).through(:contact_creator) }
+
+  describe "validations" do
+    let(:case_contact) { build_stubbed :case_contact }
+
+    it "requires describe only if amount is positive" do
+      expense = build(:additional_expense, amount: 0, describe: nil, case_contact:)
+      expect(expense).to be_valid
+      expense.update(amount: 1)
+      expect(expense).to be_invalid
+    end
+  end
 end
diff --git a/spec/models/case_contact_spec.rb b/spec/models/case_contact_spec.rb
index af6078516e..a39806114f 100644
--- a/spec/models/case_contact_spec.rb
+++ b/spec/models/case_contact_spec.rb
@@ -1,9 +1,12 @@
 require "rails_helper"
 
 RSpec.describe CaseContact, type: :model do
-  it { should have_many(:contact_topic_answers).dependent(:destroy) }
+  it { is_expected.to have_many(:contact_topic_answers).dependent(:destroy) }
   it { is_expected.to validate_numericality_of(:miles_driven).is_less_than 10_000 }
   it { is_expected.to validate_numericality_of(:miles_driven).is_greater_than_or_equal_to 0 }
+  it { is_expected.to belong_to(:creator) }
+  it { is_expected.to have_one(:casa_org).through(:casa_case) }
+  it { is_expected.to have_one(:creator_casa_org).through(:creator) }
 
   context "status is active" do
     it "belongs to a creator" do
@@ -97,10 +100,8 @@
 
   context "status is details" do
     it "ignores some validations" do
-      case_contact = build_stubbed(:case_contact, :details_status, want_driving_reimbursement: true)
-      expect(case_contact.casa_case).to be nil
-      expect(case_contact.miles_driven).to be 0
-      expect(case_contact.volunteer_address).to be_nil
+      case_contact = build_stubbed(:case_contact, :details_status)
+      expect(case_contact.casa_case).to be_nil
       expect(case_contact).to be_valid
     end
 
@@ -128,20 +129,12 @@
       expect(obj).not_to be_valid
       expect(obj.errors.full_messages).to include("Duration minutes can't be blank")
     end
-  end
 
-  context "status is expenses" do
     it "validates miles driven if want reimbursement" do
-      obj = build_stubbed(:case_contact, :expenses_status, want_driving_reimbursement: true)
+      obj = build_stubbed(:case_contact, :details_status, want_driving_reimbursement: true)
       expect(obj).not_to be_valid
       expect(obj.errors.full_messages).to include("Must enter miles driven to receive driving reimbursement.")
     end
-
-    it "requires a case to be selected" do
-      obj = build_stubbed(:case_contact, :expenses_status, :wants_reimbursement, draft_case_ids: [])
-      expect(obj).not_to be_valid
-      expect(obj.errors.full_messages).to include("CASA Case must be selected")
-    end
   end
 
   describe "#update_cleaning_contact_types" do
@@ -153,61 +146,12 @@
       case_contact = create(:case_contact, contact_types: [type1])
 
       expect(case_contact.case_contact_contact_types.count).to be 1
-      expect(case_contact.contact_types).to match_array([type1])
+      expect(case_contact.contact_types).to contain_exactly(type1)
 
       case_contact.update_cleaning_contact_types(contact_type_ids: [type2.id])
 
       expect(case_contact.case_contact_contact_types.count).to eq 1
-      expect(case_contact.contact_types.reload).to match_array([type2])
-    end
-  end
-
-  describe "#create_with_answers" do
-    let(:contact_topics) {
-      [
-        build(:contact_topic, active: true, soft_delete: false),
-        build(:contact_topic, active: false, soft_delete: false),
-        build(:contact_topic, active: true, soft_delete: true),
-        build(:contact_topic, active: false, soft_delete: true)
-      ]
-    }
-    let(:org) { create(:casa_org, contact_topics:) }
-    let(:admin) { create(:casa_admin, casa_org: org) }
-    let(:casa_case) { create(:casa_case, casa_org: org) }
-
-    context "when creation is successful" do
-      it "create a case_contact" do
-        org
-        expect {
-          CaseContact.create_with_answers(org, creator: admin)
-        }.to change(CaseContact, :count).from(0).to(1)
-      end
-
-      it "creates only active and non-deleted contact_topic_answers" do
-        org
-        expect {
-          CaseContact.create_with_answers(org, creator: admin)
-        }.to change(ContactTopicAnswer, :count).from(0).to(1)
-
-        case_contact = CaseContact.last
-        topics = case_contact.contact_topic_answers.map(&:contact_topic)
-
-        expect(topics).to include(contact_topics.first)
-      end
-    end
-
-    context "when a topic answer creation fails" do
-      it "does not create a case contact" do
-        expect {
-          CaseContact.create_with_answers(org)
-        }.to_not change(CaseContact, :count)
-      end
-
-      it "adds errors from contact_topic_answers" do
-        allow(org.contact_topics).to receive(:active).and_return([nil])
-        result = CaseContact.create_with_answers(org, creator: admin)
-        expect(result.errors[:contact_topic_answers]).to include("could not create topic nil")
-      end
+      expect(case_contact.contact_types.reload).to contain_exactly(type2)
     end
   end
 
@@ -227,7 +171,7 @@
         subject(:occurred_starting_at) { described_class.occurred_starting_at(date) }
 
         context "with specified date" do
-          it { is_expected.to match_array([case_contacts.second, case_contacts.third]) }
+          it { is_expected.to contain_exactly(case_contacts.second, case_contacts.third) }
         end
 
         context "with no specified date" do
@@ -241,7 +185,7 @@
         subject(:occurred_ending_at) { described_class.occurred_ending_at(date) }
 
         context "with specified date" do
-          it { is_expected.to match_array([case_contacts.first, case_contacts.second]) }
+          it { is_expected.to contain_exactly(case_contacts.first, case_contacts.second) }
         end
 
         context "with no specified date" do
@@ -279,7 +223,7 @@
           case_contact_1 = create(:case_contact, contact_made: false)
           case_contact_2 = create(:case_contact, contact_made: true)
 
-          expect(CaseContact.contact_made("")).to match_array([case_contact_1, case_contact_2])
+          expect(CaseContact.contact_made("")).to contain_exactly(case_contact_1, case_contact_2)
         end
       end
 
@@ -288,7 +232,7 @@
           case_contact = create(:case_contact, contact_made: true)
           build_stubbed(:case_contact, contact_made: false)
 
-          expect(CaseContact.contact_made(true)).to match_array([case_contact])
+          expect(CaseContact.contact_made(true)).to contain_exactly(case_contact)
         end
       end
 
@@ -297,7 +241,7 @@
           case_contact = create(:case_contact, contact_made: false)
           build_stubbed(:case_contact, contact_made: true)
 
-          expect(CaseContact.contact_made(false)).to match_array([case_contact])
+          expect(CaseContact.contact_made(false)).to contain_exactly(case_contact)
         end
       end
     end
@@ -311,9 +255,7 @@
         let!(:case_contact_2) { create(:case_contact, {casa_case: casa_case_2}) }
 
         it "returns case contacts filtered by contact made option" do
-          expect(described_class.has_transitioned).to match_array(
-            [case_contact_1, case_contact_2]
-          )
+          expect(described_class.has_transitioned).to contain_exactly(case_contact_1, case_contact_2)
         end
       end
 
@@ -322,7 +264,7 @@
         let!(:case_contact_2) { create(:case_contact, {casa_case: casa_case_2}) }
 
         it "returns case contacts filtered by contact made option" do
-          expect(described_class.has_transitioned(true)).to match_array([case_contact_1])
+          expect(described_class.has_transitioned(true)).to contain_exactly(case_contact_1)
         end
       end
 
@@ -331,7 +273,7 @@
         let!(:case_contact_2) { create(:case_contact, {casa_case: casa_case_2}) }
 
         it "returns case contacts filtered by contact made option" do
-          expect(described_class.has_transitioned(false)).to match_array([case_contact_2])
+          expect(described_class.has_transitioned(false)).to contain_exactly(case_contact_2)
         end
       end
     end
@@ -342,7 +284,7 @@
           case_contact_1 = create(:case_contact, {miles_driven: 50, want_driving_reimbursement: true})
           case_contact_2 = create(:case_contact, {miles_driven: 50, want_driving_reimbursement: false})
 
-          expect(CaseContact.want_driving_reimbursement("")).to match_array([case_contact_1, case_contact_2])
+          expect(CaseContact.want_driving_reimbursement("")).to contain_exactly(case_contact_1, case_contact_2)
         end
       end
 
@@ -351,7 +293,7 @@
           case_contact = create(:case_contact, {miles_driven: 50, want_driving_reimbursement: true})
           build_stubbed(:case_contact, {miles_driven: 50, want_driving_reimbursement: false})
 
-          expect(CaseContact.want_driving_reimbursement(true)).to match_array([case_contact])
+          expect(CaseContact.want_driving_reimbursement(true)).to contain_exactly(case_contact)
         end
       end
 
@@ -360,7 +302,7 @@
           build_stubbed(:case_contact, {miles_driven: 50, want_driving_reimbursement: true})
           case_contact = create(:case_contact, {miles_driven: 50, want_driving_reimbursement: false})
 
-          expect(CaseContact.want_driving_reimbursement(false)).to match_array([case_contact])
+          expect(CaseContact.want_driving_reimbursement(false)).to contain_exactly(case_contact)
         end
       end
     end
@@ -418,13 +360,13 @@
           context "when sorting by ascending order" do
             let(:direction) { "asc" }
 
-            it { is_expected.to match_array [case_contacts[0], case_contacts[2], case_contacts[1]] }
+            it { is_expected.to contain_exactly(case_contacts[0], case_contacts[2], case_contacts[1]) }
           end
 
           context "when sorting by descending order" do
             let(:direction) { "desc" }
 
-            it { is_expected.to match_array [case_contacts[1], case_contacts[2], case_contacts[0]] }
+            it { is_expected.to contain_exactly(case_contacts[1], case_contacts[2], case_contacts[0]) }
           end
         end
 
@@ -450,13 +392,13 @@
           context "when sorting by ascending order" do
             let(:direction) { "asc" }
 
-            it { is_expected.to match_array [case_contacts[1], case_contacts[0], case_contacts[2]] }
+            it { is_expected.to contain_exactly(case_contacts[1], case_contacts[0], case_contacts[2]) }
           end
 
           context "when sorting by descending order" do
             let(:direction) { "desc" }
 
-            it { is_expected.to match_array [case_contacts[2], case_contacts[0], case_contacts[1]] }
+            it { is_expected.to contain_exactly(case_contacts[2], case_contacts[0], case_contacts[1]) }
           end
         end
 
@@ -474,13 +416,13 @@
           context "when sorting by ascending order" do
             let(:direction) { "asc" }
 
-            it { is_expected.to match_array [case_contacts[0], case_contacts[2], case_contacts[1]] }
+            it { is_expected.to contain_exactly(case_contacts[0], case_contacts[2], case_contacts[1]) }
           end
 
           context "when sorting by descending order" do
             let(:direction) { "desc" }
 
-            it { is_expected.to match_array [case_contacts[1], case_contacts[2], case_contacts[0]] }
+            it { is_expected.to contain_exactly(case_contacts[1], case_contacts[2], case_contacts[0]) }
           end
         end
 
@@ -497,13 +439,13 @@
           context "when sorting by ascending order" do
             let(:direction) { "asc" }
 
-            it { is_expected.to match_array [case_contacts[0], case_contacts[1]] }
+            it { is_expected.to contain_exactly(case_contacts[0], case_contacts[1]) }
           end
 
           context "when sorting by descending order" do
             let(:direction) { "desc" }
 
-            it { is_expected.to match_array [case_contacts[1], case_contacts[0]] }
+            it { is_expected.to contain_exactly(case_contacts[1], case_contacts[0]) }
           end
         end
 
@@ -520,13 +462,13 @@
           context "when sorting by ascending order" do
             let(:direction) { "asc" }
 
-            it { is_expected.to match_array [case_contacts[1], case_contacts[0]] }
+            it { is_expected.to contain_exactly(case_contacts[1], case_contacts[0]) }
           end
 
           context "when sorting by descending order" do
             let(:direction) { "desc" }
 
-            it { is_expected.to match_array [case_contacts[0], case_contacts[1]] }
+            it { is_expected.to contain_exactly(case_contacts[0], case_contacts[1]) }
           end
         end
       end
@@ -579,9 +521,9 @@
 
       groups_with_types = case_contact.contact_groups_with_types
 
-      expect(groups_with_types.keys).to match_array(["Family", "Health"])
-      expect(groups_with_types["Family"]).to match_array(["Parent"])
-      expect(groups_with_types["Health"]).to match_array(["Medical Professional", "Other Therapist"])
+      expect(groups_with_types.keys).to contain_exactly("Family", "Health")
+      expect(groups_with_types["Family"]).to contain_exactly("Parent")
+      expect(groups_with_types["Health"]).to contain_exactly("Medical Professional", "Other Therapist")
     end
   end
 
@@ -645,7 +587,7 @@
     end
 
     it "returns false if creator's supervisor is inactive" do
-      supervisor.update(active: false)
+      supervisor.update!(active: false)
       expect(case_contact.should_send_reimbursement_email?).to be false
     end
   end
@@ -687,7 +629,7 @@
 
       context "when casa case has no volunteers assigned" do
         it "volunteer is nil" do
-          expect(case_contact.volunteer).to be nil
+          expect(case_contact.volunteer).to be_nil
         end
 
         it "disbales address field" do
@@ -705,7 +647,7 @@
         }
 
         it "volunteer is nil" do
-          expect(case_contact.volunteer).to be nil
+          expect(case_contact.volunteer).to be_nil
         end
 
         it "disbales address field" do
diff --git a/spec/models/contact_topic_answer_spec.rb b/spec/models/contact_topic_answer_spec.rb
index df65741ed7..b58c62cea4 100644
--- a/spec/models/contact_topic_answer_spec.rb
+++ b/spec/models/contact_topic_answer_spec.rb
@@ -2,7 +2,9 @@
 
 RSpec.describe ContactTopicAnswer, type: :model do
   it { should belong_to(:case_contact) }
-  it { should belong_to(:contact_topic) }
+  it { should belong_to(:contact_topic).optional(true) }
+  it { is_expected.to have_one(:contact_creator).through(:case_contact) }
+  it { is_expected.to have_one(:contact_creator_casa_org).through(:contact_creator) }
 
   it "can hold more than 255 characters" do
     expect {
diff --git a/spec/policies/additional_expense_policy_spec.rb b/spec/policies/additional_expense_policy_spec.rb
new file mode 100644
index 0000000000..7bfec80284
--- /dev/null
+++ b/spec/policies/additional_expense_policy_spec.rb
@@ -0,0 +1,128 @@
+require "rails_helper"
+
+RSpec.describe AdditionalExpensePolicy, type: :policy, aggregate_failures: true do
+  let(:casa_org) { create :casa_org }
+  let(:volunteer) { create :volunteer, :with_single_case, casa_org: }
+  let(:supervisor) { create :supervisor, casa_org: }
+  let(:casa_admin) { create :casa_admin, casa_org: }
+  let(:all_casa_admin) { create :all_casa_admin }
+
+  let(:casa_case) { volunteer.casa_cases.first }
+  let(:case_contact) { create :case_contact, casa_case:, creator: volunteer }
+  let(:additional_expense) { create :additional_expense, case_contact: }
+
+  let(:draft_case_contact) { create :case_contact, :started_status, casa_case: nil, creator: volunteer }
+  let(:draft_additional_expense) { create :additional_expense, case_contact: draft_case_contact }
+  let(:new_additional_expense) do
+    build :additional_expense, case_contact: draft_case_contact, other_expense_amount: 0, other_expenses_describe: ""
+  end
+
+  let(:same_case_volunteer) { create :volunteer, casa_org: }
+  let(:same_case_volunteer_case_assignment) { create :case_assignment, volunteer: same_case_volunteer, casa_case: }
+  let(:same_case_volunteer_case_contact) do
+    same_case_volunteer_case_assignment
+    create :case_contact, casa_case:, creator: same_case_volunteer
+  end
+  let(:same_case_volunteer_additional_expense) do
+    create :additional_expense, case_contact: same_case_volunteer_case_contact
+  end
+
+  let(:other_org) { create :casa_org }
+  let(:other_org_volunteer) { create :volunteer, casa_org: other_org }
+  let(:other_org_casa_case) { create :casa_case, casa_org: other_org }
+  let(:other_org_case_contact) { create :case_contact, casa_case: other_org_casa_case, creator: other_org_volunteer }
+  let(:other_org_additional_expense) { create :additional_expense, case_contact: other_org_case_contact }
+
+  subject { described_class }
+
+  permissions :create?, :destroy? do
+    it "does not permit a nil user" do
+      is_expected.not_to permit(nil, additional_expense)
+    end
+
+    it "permits volunteers assigned to the expense's case contact" do
+      is_expected.to permit(volunteer, additional_expense)
+      is_expected.to permit(volunteer, draft_additional_expense)
+      is_expected.to permit(volunteer, new_additional_expense)
+
+      is_expected.not_to permit(volunteer, same_case_volunteer_additional_expense)
+      is_expected.not_to permit(volunteer, other_org_additional_expense)
+    end
+
+    it "permits same org supervisors" do
+      is_expected.to permit(supervisor, additional_expense)
+      is_expected.to permit(supervisor, draft_additional_expense)
+      is_expected.to permit(supervisor, draft_additional_expense)
+      is_expected.to permit(supervisor, same_case_volunteer_additional_expense)
+
+      is_expected.not_to permit(supervisor, other_org_additional_expense)
+    end
+
+    it "permits same org casa admins" do
+      is_expected.to permit(casa_admin, additional_expense)
+      is_expected.to permit(casa_admin, draft_additional_expense)
+      is_expected.to permit(casa_admin, new_additional_expense)
+      is_expected.to permit(casa_admin, same_case_volunteer_additional_expense)
+
+      is_expected.not_to permit(casa_admin, other_org_additional_expense)
+    end
+
+    it "does not permit an all casa admin" do
+      is_expected.not_to permit(all_casa_admin, additional_expense)
+    end
+  end
+
+  describe "Scope#resolve" do
+    subject { described_class::Scope.new(user, AdditionalExpense.all).resolve }
+
+    before do
+      additional_expense
+      draft_additional_expense
+      same_case_volunteer_additional_expense
+      other_org_additional_expense
+    end
+
+    context "when user is a visitor" do
+      let(:user) { nil }
+
+      it "returns no expenses" do
+        is_expected.not_to include(additional_expense, other_org_additional_expense)
+      end
+    end
+
+    context "when user is a volunteer" do
+      let(:user) { volunteer }
+
+      it "includes expenses for contacts created by volunteer only" do
+        is_expected.to include(additional_expense, draft_additional_expense)
+        is_expected.not_to include(same_case_volunteer_additional_expense, other_org_additional_expense)
+      end
+    end
+
+    context "when user is a supervisor" do
+      let(:user) { supervisor }
+
+      it "includes same org expenses only" do
+        is_expected.to include(additional_expense, draft_additional_expense, same_case_volunteer_additional_expense)
+        is_expected.not_to include(other_org_additional_expense)
+      end
+    end
+
+    context "when user is a casa_admin" do
+      let(:user) { casa_admin }
+
+      it "includes same org expenses only" do
+        is_expected.to include(additional_expense, draft_additional_expense, draft_additional_expense)
+        is_expected.not_to include(other_org_additional_expense)
+      end
+    end
+
+    context "when user is an all_casa_admin" do
+      let(:user) { all_casa_admin }
+
+      it "returns no expenses" do
+        is_expected.not_to include(additional_expense, other_org_additional_expense)
+      end
+    end
+  end
+end
diff --git a/spec/policies/case_contact_policy/scope_spec.rb b/spec/policies/case_contact_policy/scope_spec.rb
deleted file mode 100644
index e20fd6d787..0000000000
--- a/spec/policies/case_contact_policy/scope_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require "rails_helper"
-
-RSpec.describe CaseContactPolicy::Scope do
-  describe "#resolve" do
-    it "returns all CaseContacts when user is admin" do
-      user = build(:casa_admin)
-      all_case_contacts = create_list(:case_contact, 2)
-
-      scope = described_class.new(user, CaseContact)
-
-      expect(scope.resolve).to match_array all_case_contacts
-    end
-
-    context "when user is volunteer" do
-      it "returns all of the case contacts of the volunteer" do
-        current_user = build(:volunteer)
-        relevant_case = create(:casa_case)
-        other_user = create(:volunteer)
-
-        # we have to do a setup to test this since it's tested elsewhere
-        allow(CasaCase).to receive(:actively_assigned_to)
-          .and_return(CasaCase.where(id: relevant_case))
-
-        relevant_contacts =
-          create_list(:case_contact, 2, casa_case: relevant_case, creator: current_user)
-        build(:case_contact, casa_case: relevant_case, creator: other_user)
-        create_irrelevant_contacts(current_user, other_user)
-
-        scope = described_class.new(current_user, CaseContact)
-        aggregate_failures do
-          expect(scope.resolve.include?(relevant_contacts[0])).to eq true
-          expect(scope.resolve.include?(relevant_contacts[1])).to eq true
-          expect(scope.resolve.length).to eq 2
-        end
-      end
-    end
-
-    def create_irrelevant_contacts(current_user, other_user)
-      irrelevant_case = create(:casa_case)
-
-      create_list(:case_contact, 2, casa_case: irrelevant_case, creator: current_user)
-      build(:case_contact, casa_case: irrelevant_case, creator: other_user)
-    end
-  end
-end
diff --git a/spec/policies/case_contact_policy_spec.rb b/spec/policies/case_contact_policy_spec.rb
index 37ac8c83e2..8fd284cd5c 100644
--- a/spec/policies/case_contact_policy_spec.rb
+++ b/spec/policies/case_contact_policy_spec.rb
@@ -1,12 +1,30 @@
 require "rails_helper"
 
-RSpec.describe CaseContactPolicy do
+RSpec.describe CaseContactPolicy, aggregate_failures: true do
   subject { described_class }
 
-  let(:casa_admin) { build(:casa_admin) }
-  let(:case_contact) { build(:case_contact) }
-  let(:volunteer) { build(:volunteer) }
-  let(:supervisor) { build(:supervisor) }
+  let(:casa_org) { create(:casa_org) }
+  let(:casa_admin) { build(:casa_admin, casa_org:) }
+  let(:supervisor) { build(:supervisor, casa_org:) }
+  let(:volunteer) { create(:volunteer, :with_single_case, supervisor:, casa_org:) }
+  let(:casa_case) { volunteer.casa_cases.first }
+
+  let(:case_contact) { create(:case_contact, casa_case:, creator: volunteer) }
+  let(:draft_case_contact) { create(:case_contact, :started_status, casa_case: nil, creator: volunteer) }
+
+  # another volunteer assigned to the same case
+  let(:same_case_volunteer) { create :volunteer, casa_org: }
+  let(:same_case_volunteer_case_assignment) { create :case_assignment, volunteer: same_case_volunteer, casa_case: }
+  let(:same_case_volunteer_case_contact) do
+    same_case_volunteer_case_assignment
+    create :case_contact, casa_case:, creator: same_case_volunteer
+  end
+
+  # same org case that volunteer is not assigned to
+  let(:unassigned_case_case_contact) do
+    create :case_contact, casa_case: create(:casa_case, casa_org:), creator: create(:volunteer, casa_org:)
+  end
+  let(:other_org_case_contact) { build(:case_contact, casa_org: create(:casa_org)) }
 
   permissions :index? do
     it "allows casa_admins" do
@@ -23,103 +41,205 @@
   end
 
   permissions :show? do
-    it "allows casa_admins" do
+    it "allows same org casa_admins" do
       is_expected.to permit(casa_admin, case_contact)
-    end
+      is_expected.to permit(casa_admin, draft_case_contact)
+      is_expected.to permit(casa_admin, same_case_volunteer_case_contact)
+      is_expected.to permit(casa_admin, unassigned_case_case_contact)
 
-    context "when volunteer is the creator" do
-      let(:case_contact) { build_stubbed(:case_contact, creator: volunteer) }
+      is_expected.not_to permit(casa_admin, other_org_case_contact)
+    end
 
-      it "allows the volunteer" do
-        is_expected.to permit(volunteer, case_contact)
-      end
+    it "does not allow supervisors" do
+      is_expected.not_to permit(supervisor, case_contact)
+      is_expected.not_to permit(supervisor, draft_case_contact)
+      is_expected.not_to permit(supervisor, same_case_volunteer_case_contact)
+      is_expected.not_to permit(supervisor, unassigned_case_case_contact)
+      is_expected.not_to permit(supervisor, other_org_case_contact)
     end
 
-    context "when volunteer is not the creator" do
-      it "does not allow the volunteer" do
-        is_expected.not_to permit(volunteer, case_contact)
-      end
+    it "allows volunteer only if they created the case contact" do
+      is_expected.to permit(volunteer, case_contact)
+      is_expected.to permit(volunteer, draft_case_contact)
+
+      is_expected.not_to permit(volunteer, unassigned_case_case_contact)
+      is_expected.not_to permit(volunteer, other_org_case_contact)
     end
   end
 
-  permissions :edit? do
-    it "allows casa_admins" do
+  permissions :edit?, :update? do
+    it "allows same org casa_admins" do
       is_expected.to permit(casa_admin, case_contact)
+      is_expected.to permit(casa_admin, draft_case_contact)
+      is_expected.to permit(casa_admin, same_case_volunteer_case_contact)
+      is_expected.to permit(casa_admin, unassigned_case_case_contact)
+
+      is_expected.not_to permit(casa_admin, other_org_case_contact)
     end
 
-    it "allows supervisors" do
+    it "allows same org supervisors" do
       is_expected.to permit(supervisor, case_contact)
+      is_expected.to permit(supervisor, draft_case_contact)
+      is_expected.to permit(supervisor, same_case_volunteer_case_contact)
+
+      is_expected.not_to permit(supervisor, other_org_case_contact)
     end
 
-    context "when volunteer is assigned" do
-      it "allows the volunteer" do
-        case_contact = build_stubbed(:case_contact, creator: volunteer)
+    it "allows volunteer only if they created the case contact" do
+      is_expected.to permit(volunteer, case_contact)
+      is_expected.to permit(volunteer, draft_case_contact)
 
-        is_expected.to permit(volunteer, case_contact)
-      end
+      is_expected.not_to permit(volunteer, same_case_volunteer_case_contact)
+      is_expected.not_to permit(volunteer, unassigned_case_case_contact)
+      is_expected.not_to permit(volunteer, other_org_case_contact)
     end
+  end
 
-    context "when volunteer is not the creator" do
-      it "does not allow the volunteer" do
-        is_expected.not_to permit(volunteer, case_contact)
-      end
+  permissions :new? do
+    it "allows same org casa_admins" do
+      is_expected.to permit(volunteer, case_contact.dup)
+      is_expected.to permit(volunteer, draft_case_contact.dup)
+
+      is_expected.not_to permit(casa_admin, CaseContact.new)
+    end
+
+    it "allows same org supervisors" do
+      is_expected.to permit(volunteer, case_contact.dup)
+      is_expected.to permit(volunteer, draft_case_contact.dup)
+
+      is_expected.not_to permit(supervisor, CaseContact.new)
+    end
+
+    it "allows volunteers who are the contact creator" do
+      is_expected.to permit(volunteer, case_contact.dup)
+      is_expected.to permit(volunteer, draft_case_contact.dup)
+
+      is_expected.not_to permit(volunteer, CaseContact.new)
     end
   end
 
-  permissions :new? do
+  permissions :drafts? do
     it "allows casa_admins" do
       is_expected.to permit(casa_admin)
     end
 
-    it "does allow volunteers" do
-      is_expected.to permit(volunteer, CaseContact.new)
+    it "allows supervisors" do
+      is_expected.to permit(supervisor)
+    end
+
+    it "does not allow volunteers" do
+      is_expected.not_to permit(volunteer)
     end
   end
 
-  permissions :update?, :drafts? do
-    it "allows casa_admins" do
+  permissions :destroy? do
+    it "allows same org casa_admins" do
       is_expected.to permit(casa_admin, case_contact)
+      is_expected.to permit(casa_admin, draft_case_contact)
+      is_expected.to permit(casa_admin, same_case_volunteer_case_contact)
+      is_expected.to permit(casa_admin, unassigned_case_case_contact)
+
+      is_expected.not_to permit(casa_admin, other_org_case_contact)
     end
 
     it "allows supervisors" do
       is_expected.to permit(supervisor, case_contact)
+      is_expected.to permit(supervisor, draft_case_contact)
+      is_expected.to permit(supervisor, same_case_volunteer_case_contact)
+
+      is_expected.not_to permit(supervisor, other_org_case_contact)
     end
 
-    it "does not allow volunteers" do
+    it "allows volunteer only for draft contacts they created" do
+      is_expected.to permit(volunteer, draft_case_contact)
+
       is_expected.not_to permit(volunteer, case_contact)
+      is_expected.not_to permit(volunteer, same_case_volunteer_case_contact)
+      is_expected.not_to permit(volunteer, unassigned_case_case_contact)
+      is_expected.not_to permit(volunteer, other_org_case_contact)
     end
   end
 
-  permissions :destroy? do
-    it "allows casa_admins" do
+  permissions :restore? do
+    it "allows same org casa_admins" do
       is_expected.to permit(casa_admin, case_contact)
+      is_expected.to permit(casa_admin, draft_case_contact)
+      is_expected.to permit(casa_admin, same_case_volunteer_case_contact)
+      is_expected.to permit(casa_admin, unassigned_case_case_contact)
+      is_expected.not_to permit(casa_admin, other_org_case_contact)
     end
 
-    context "when volunteer is assigned" do
-      context "case_contact is a draft" do
-        let(:case_contact) { build_stubbed(:case_contact, :started_status, creator: volunteer) }
+    it "does not allow supervisors" do
+      is_expected.not_to permit(supervisor, case_contact)
+      is_expected.not_to permit(supervisor, draft_case_contact)
+      is_expected.not_to permit(supervisor, same_case_volunteer_case_contact)
+      is_expected.not_to permit(supervisor, unassigned_case_case_contact)
+      is_expected.not_to permit(supervisor, other_org_case_contact)
+    end
 
-        it { is_expected.to permit(volunteer, case_contact) }
+    it "does not allow volunteers" do
+      is_expected.not_to permit(volunteer, draft_case_contact)
+      is_expected.not_to permit(volunteer, case_contact)
+      is_expected.not_to permit(volunteer, same_case_volunteer_case_contact)
+      is_expected.not_to permit(volunteer, unassigned_case_case_contact)
+      is_expected.not_to permit(volunteer, other_org_case_contact)
+    end
+  end
+
+  describe "Scope#resolve" do
+    subject { described_class::Scope.new(user, CaseContact.all).resolve }
+
+    before do
+      case_contact
+      draft_case_contact
+      same_case_volunteer_case_contact
+      unassigned_case_case_contact
+      other_org_case_contact
+    end
+
+    context "when user is a visitor" do
+      let(:user) { nil }
+
+      it "returns no case contacts" do
+        is_expected.not_to include(case_contact, other_org_case_contact)
       end
+    end
+
+    context "when user is a volunteer" do
+      let(:user) { volunteer }
+
+      it "returns case contacts created by the volunteer" do
+        is_expected.to include(case_contact, draft_case_contact)
+        is_expected
+          .not_to include(same_case_volunteer_case_contact, unassigned_case_case_contact, other_org_case_contact)
+      end
+    end
 
-      context "case_contact is not a draft" do
-        let(:case_contact) { build_stubbed(:case_contact, :active, creator: volunteer) }
+    context "when user is a supervisor" do
+      let(:user) { supervisor }
 
-        it { is_expected.not_to permit(volunteer, case_contact) }
+      it "returns same org case contacts" do
+        is_expected
+          .to include(case_contact, draft_case_contact, same_case_volunteer_case_contact, unassigned_case_case_contact)
+        is_expected.not_to include(other_org_case_contact)
       end
     end
 
-    context "when volunteer is not assigned" do
-      context "case_contact is a draft" do
-        let(:case_contact) { build_stubbed(:case_contact, :started_status, creator: build_stubbed(:volunteer)) }
+    context "when user is a casa_admin" do
+      let(:user) { casa_admin }
 
-        it { is_expected.not_to permit(volunteer, case_contact) }
+      it "returns same org case contacts" do
+        is_expected
+          .to include(case_contact, draft_case_contact, same_case_volunteer_case_contact, unassigned_case_case_contact)
+        is_expected.not_to include(other_org_case_contact)
       end
+    end
 
-      context "case_contact is not a draft" do
-        let(:case_contact) { build_stubbed(:case_contact, :active, creator: build_stubbed(:volunteer)) }
+    context "when user is an all_casa_admin" do
+      let(:user) { create :all_casa_admin }
 
-        it { is_expected.not_to permit(volunteer, case_contact) }
+      it "returns no case contacts" do
+        is_expected.not_to include(case_contact, other_org_case_contact)
       end
     end
   end
diff --git a/spec/policies/contact_topic_answer_policy_spec.rb b/spec/policies/contact_topic_answer_policy_spec.rb
new file mode 100644
index 0000000000..26f21b2898
--- /dev/null
+++ b/spec/policies/contact_topic_answer_policy_spec.rb
@@ -0,0 +1,127 @@
+require "rails_helper"
+
+RSpec.describe ContactTopicAnswerPolicy, type: :policy, aggregate_failures: true do
+  let(:casa_org) { create :casa_org }
+  let(:volunteer) { create :volunteer, :with_single_case, casa_org: }
+  let(:supervisor) { create :supervisor, casa_org: }
+  let(:casa_admin) { create :casa_admin, casa_org: }
+  let(:all_casa_admin) { create :all_casa_admin }
+
+  let(:contact_topic) { create :contact_topic, casa_org: }
+  let(:casa_case) { volunteer.casa_cases.first }
+  let(:case_contact) { create :case_contact, creator: volunteer }
+  let(:contact_topic_answer) { create :contact_topic_answer, contact_topic:, case_contact: }
+
+  let(:draft_case_contact) { create :case_contact, :started_status, casa_case: nil, creator: volunteer }
+  let(:draft_contact_topic_answer) { create :contact_topic_answer, contact_topic:, case_contact: draft_case_contact }
+
+  let(:same_case_volunteer) { create :volunteer, casa_org: }
+  let(:same_case_volunteer_case_assignment) { create :case_assignment, volunteer: same_case_volunteer, casa_case: }
+  let(:same_case_volunteer_case_contact) do
+    same_case_volunteer_case_assignment
+    create :case_contact, casa_case:, creator: same_case_volunteer
+  end
+  let(:same_case_volunteer_contact_topic_answer) do
+    create :contact_topic_answer, contact_topic:, case_contact: same_case_volunteer_case_contact
+  end
+
+  let(:other_org) { create :casa_org }
+  let(:other_org_volunteer) { create :volunteer, casa_org: other_org }
+  let(:other_org_contact_topic) { create :contact_topic, casa_org: other_org }
+  let(:other_org_casa_case) { create :casa_case, casa_org: other_org }
+  let(:other_org_case_contact) { create :case_contact, casa_case: other_org_casa_case, creator: other_org_volunteer }
+  let(:other_org_contact_topic_answer) do
+    create :contact_topic_answer, case_contact: other_org_case_contact, contact_topic: other_org_contact_topic
+  end
+
+  subject { described_class }
+
+  permissions :create?, :destroy? do
+    it "does not permit a nil user" do
+      is_expected.not_to permit(nil, contact_topic_answer)
+    end
+
+    it "permits a volunteer who created the case contact" do
+      is_expected.to permit(volunteer, contact_topic_answer)
+      is_expected.to permit(volunteer, draft_contact_topic_answer)
+      is_expected.not_to permit(volunteer, same_case_volunteer_contact_topic_answer)
+      is_expected.not_to permit(volunteer, other_org_contact_topic_answer)
+    end
+
+    it "permits same_org supervisors" do
+      is_expected.to permit(supervisor, contact_topic_answer)
+      is_expected.to permit(supervisor, draft_contact_topic_answer)
+      is_expected.to permit(supervisor, same_case_volunteer_contact_topic_answer)
+
+      is_expected.not_to permit(supervisor, other_org_contact_topic_answer)
+    end
+
+    it "permits same org casa admins" do
+      is_expected.to permit(casa_admin, contact_topic_answer)
+      is_expected.to permit(casa_admin, draft_contact_topic_answer)
+      is_expected.to permit(casa_admin, same_case_volunteer_contact_topic_answer)
+
+      is_expected.not_to permit(casa_admin, other_org_contact_topic_answer)
+    end
+
+    it "does not permit an all casa admin" do
+      is_expected.not_to permit(all_casa_admin, contact_topic_answer)
+    end
+  end
+
+  describe "Scope#resolve" do
+    subject { described_class::Scope.new(user, ContactTopicAnswer.all).resolve }
+
+    before do
+      contact_topic_answer
+      draft_contact_topic_answer
+      same_case_volunteer_contact_topic_answer
+      other_org_contact_topic_answer
+    end
+
+    context "when user is a visitor" do
+      let(:user) { nil }
+
+      it "returns no contact topic answers" do
+        is_expected.not_to include(contact_topic_answer, other_org_contact_topic_answer)
+      end
+    end
+
+    context "when user is a volunteer" do
+      let(:user) { volunteer }
+
+      it "returns contact topic answers of contacts created by the volunteer" do
+        is_expected.to include(contact_topic_answer, draft_contact_topic_answer)
+        is_expected.not_to include(same_case_volunteer_contact_topic_answer, other_org_contact_topic_answer)
+      end
+    end
+
+    context "when user is a supervisor" do
+      let(:user) { supervisor }
+
+      it "returns same org contact topic answers" do
+        is_expected
+          .to include(contact_topic_answer, draft_contact_topic_answer, same_case_volunteer_contact_topic_answer)
+        is_expected.not_to include(other_org_contact_topic_answer)
+      end
+    end
+
+    context "when user is a casa_admin" do
+      let(:user) { casa_admin }
+
+      it "includes same org contact topic answers" do
+        is_expected
+          .to include(contact_topic_answer, draft_contact_topic_answer, same_case_volunteer_contact_topic_answer)
+        is_expected.not_to include(other_org_contact_topic_answer)
+      end
+    end
+
+    context "when user is an all_casa_admin" do
+      let(:user) { all_casa_admin }
+
+      it "returns no contact topic answers" do
+        is_expected.not_to include(contact_topic_answer, other_org_contact_topic_answer)
+      end
+    end
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 8243e8f03f..7260812bd4 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -39,6 +39,7 @@
   config.include ActionText::SystemTestHelper, type: :system
   config.include TwilioHelper, type: :request
   config.include TwilioHelper, type: :system
+  config.include Support::RequestHelpers, type: :request
 
   config.after do
     Warden.test_reset!
diff --git a/spec/requests/additional_expenses_spec.rb b/spec/requests/additional_expenses_spec.rb
new file mode 100644
index 0000000000..a50481c882
--- /dev/null
+++ b/spec/requests/additional_expenses_spec.rb
@@ -0,0 +1,83 @@
+require "rails_helper"
+
+RSpec.describe "/additional_expenses", type: :request do
+  let(:casa_org) { create :casa_org }
+  let(:volunteer) { create :volunteer, :with_single_case, casa_org: }
+  let(:casa_case) { volunteer.casa_cases.first }
+  let(:case_contact) { create :case_contact, casa_case:, creator: volunteer }
+
+  let(:valid_attributes) do
+    attributes_for(:additional_expense)
+      .merge({case_contact_id: case_contact.id})
+  end
+  let(:invalid_attributes) { valid_attributes.merge({other_expenses_describe: nil, other_expense_amount: 1}) }
+
+  before { sign_in volunteer }
+
+  describe "POST /create" do
+    let(:params) { {additional_expense: valid_attributes} }
+
+    subject { post additional_expenses_path, params:, as: :json }
+
+    it "creates a record and responds created" do
+      expect { subject }.to change(AdditionalExpense, :count).by(1)
+      expect(response).to have_http_status(:created)
+    end
+
+    it "returns the new contact topic answer as json" do
+      subject
+      expect(response.content_type).to match(a_string_including("application/json"))
+      answer = AdditionalExpense.last
+      expect(response_json[:id]).to eq answer.id
+      expect(response_json.keys)
+        .to include(:id, :case_contact_id, :other_expense_amount, :other_expenses_describe)
+    end
+
+    context "with invalid parameters" do
+      let(:params) { {additional_expense: invalid_attributes} }
+
+      it "fails and responds unprocessable_entity" do
+        expect { subject }.to change(ContactTopicAnswer, :count).by(0)
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it "returns errors as json" do
+        subject
+        expect(response.content_type).to match(a_string_including("application/json"))
+        expect(response.body).to be_present
+        expect(response_json[:other_expenses_describe]).to include("can't be blank")
+      end
+    end
+
+    context "html request" do
+      subject { post additional_expenses_path, params: }
+
+      it "redirects to referrer/root without creating an additional expense" do
+        expect { subject }.to not_change(AdditionalExpense, :count)
+        expect(response).to redirect_to(root_url)
+      end
+    end
+  end
+
+  describe "DELETE /destroy" do
+    let!(:additional_expense) { create :additional_expense, case_contact: }
+
+    subject { delete additional_expense_url(additional_expense), as: :json }
+
+    it "destroys the record and responds no content" do
+      expect { subject }
+        .to change(AdditionalExpense, :count).by(-1)
+      expect(response).to have_http_status(:no_content)
+      expect(response.body).to be_empty
+    end
+
+    context "html request" do
+      subject { delete additional_expense_url(additional_expense) }
+
+      it "redirects to referrer/root without destroying the additional expense" do
+        expect { subject }.to not_change(AdditionalExpense, :count)
+        expect(response).to redirect_to(root_url)
+      end
+    end
+  end
+end
diff --git a/spec/requests/case_contacts/form_spec.rb b/spec/requests/case_contacts/form_spec.rb
index 7d5dc048ba..ea62581259 100644
--- a/spec/requests/case_contacts/form_spec.rb
+++ b/spec/requests/case_contacts/form_spec.rb
@@ -1,478 +1,543 @@
 require "rails_helper"
 
 RSpec.describe "CaseContacts::Forms", type: :request do
-  let(:organization) { build(:casa_org) }
-  let(:admin) { create(:casa_admin, casa_org: organization) }
-  let(:supervisor) { create(:supervisor, casa_org: organization) }
-  let!(:volunteer) { create(:volunteer, casa_org: organization, supervisor: supervisor) }
-  let(:creator) { admin }
-  let!(:casa_case) { create(:casa_case, casa_org: organization) }
+  let(:casa_org) { build(:casa_org) }
+  let(:contact_topics) { create_list(:contact_topic, 3, casa_org:) }
+  let(:casa_admin) { create(:casa_admin, casa_org:) }
+  let(:supervisor) { create(:supervisor, casa_org:) }
+  let(:volunteer) { create(:volunteer, :with_single_case, casa_org:, supervisor: supervisor) }
+  let(:creator) { volunteer }
+  let(:casa_case) { volunteer.casa_cases.first }
+
+  let(:user) { volunteer }
+
+  before { sign_in user }
+
+  describe "GET /new" do
+    subject(:request) { get new_case_contact_path(casa_case_id: casa_case.id) }
+
+    it "creates a new case_contact record with user as creator and status 'started'" do
+      expect { request }.to change(CaseContact, :count).by(1)
+      case_contact = CaseContact.last
+      expect(case_contact.status).to eq "started"
+      expect(case_contact.creator).to eq user
+    end
 
-  describe "GET /show" do
-    let!(:case_contact) { create(:case_contact, :details_status, casa_case: casa_case) }
-    let!(:contact_type_group_b) { create(:contact_type_group, casa_org: organization, name: "B") }
-    let!(:contact_types_b) do
-      [
-        create(:contact_type, name: "Teacher", contact_type_group: contact_type_group_b),
-        create(:contact_type, name: "Counselor", contact_type_group: contact_type_group_b)
-      ]
+    it "does not set the contact's casa_case_id" do
+      expect { request }.to change(CaseContact, :count).by(1)
+      case_contact = CaseContact.last
+      expect(case_contact.casa_case_id).to be_nil
     end
 
-    let!(:contact_type_group_a) { create(:contact_type_group, casa_org: organization, name: "A") }
-    let!(:contact_types_a) do
-      [
-        create(:contact_type, name: "Sibling", contact_type_group: contact_type_group_a),
-        create(:contact_type, name: "Parent", contact_type_group: contact_type_group_a)
-      ]
+    it "redirects to show(:details) with the created contact id" do
+      expect { request }.to change(CaseContact, :count).by(1)
+      case_contact = CaseContact.last
+      expect(request).to redirect_to(case_contact_form_path(:details, case_contact_id: case_contact.id))
     end
-    subject(:request) do
-      get case_contact_form_path(:details, case_contact_id: case_contact.id)
+  end
+
+  describe "GET /show" do
+    let(:case_contact) { create(:case_contact, :started_status, casa_case:, creator:) }
 
-      response
+    subject(:request) { get case_contact_form_path(:details, case_contact_id: case_contact.id) }
+
+    it "renders details form with success status" do
+      request
+
+      expect(response).to have_http_status(:success)
+      expect(response).to render_template(:details)
     end
 
-    describe "admin view" do
-      before { sign_in admin }
+    it "does not change status from 'started'" do
+      expect(case_contact.status).to eq "started"
+      request
 
-      context "details step" do
-        it "shows all contact types once" do
-          page = request.parsed_body.to_html
-          expected_contact_types = [].concat(contact_types_a, contact_types_b).map(&:name)
-          expected_contact_types.each { |contact_type| expect(page.scan(contact_type).size).to eq(1) }
-        end
+      expect(response).to have_http_status(:success)
+      expect(case_contact.reload.status).to eq "started"
+    end
 
-        context "when the case has specific contact types assigned" do
-          let!(:casa_case) { create(:casa_case, :with_casa_case_contact_types, casa_org: organization) }
+    context "when contact created by another casa org volunteer" do
+      let(:other_volunteer) { create(:volunteer, casa_org:) }
+      let(:creator) { other_volunteer }
+      let!(:case_assignment) { create(:case_assignment, volunteer: other_volunteer, casa_case:) }
 
-          it "shows only contact types assigned to selected casa case" do
-            page = request.parsed_body.to_html
-            expect(page).to include(*casa_case.contact_types.pluck(:name))
-            expect(page).not_to include(*contact_types_a.pluck(:name))
-            expect(page).not_to include(*contact_types_b.pluck(:name))
-          end
-        end
-        context "when an org has no topics" do
-          let(:organization) { create(:casa_org) }
-          let!(:case_contact) { create(:case_contact, :details_status, casa_case: casa_case) }
-
-          it "it shows the admin the contact topics link" do
-            page = request.parsed_body.to_html
-            expect(page).to include("Manage Case Contact Topics</a> to set your organization Court report topics.")
-          end
-        end
-        context "when the org has topics assigned" do
-          let(:contact_topics) {
-            [
-              build(:contact_topic, active: true, soft_delete: false),
-              build(:contact_topic, active: false, soft_delete: false),
-              build(:contact_topic, active: true, soft_delete: true),
-              build(:contact_topic, active: false, soft_delete: true)
-            ]
-          }
-          let(:organization) { create(:casa_org, contact_topics:) }
-          let!(:case_contact) { create(:case_contact, :details_status, :with_org_topics, casa_case: casa_case) }
-
-          it "shows contact topics" do
-            page = request.parsed_body.to_html
-            expect(page).to include(contact_topics[0].question)
-            expect(page).to_not include(contact_topics[1].question)
-            expect(page).to_not include(contact_topics[2].question)
-            expect(page).to_not include(contact_topics[3].question)
-          end
-        end
+      it "redirects to root/sign in" do
+        expect(casa_case.volunteers).to include(volunteer, other_volunteer)
+        expect(case_contact.creator).to eq other_volunteer
+        request
+
+        expect(response).to redirect_to(root_path)
       end
     end
-    describe "volunteer view" do
-      before { sign_in volunteer }
 
-      context "details step - when an org has no topics" do
-        let(:organization) { create(:casa_org) }
-        let!(:case_contact) { create(:case_contact, :details_status, casa_case: casa_case, creator: volunteer) }
+    context "when user is supervisor" do
+      let(:user) { supervisor }
 
-        it "guides volunteer to contact admin" do
-          page = request.parsed_body.to_html
-          expect(page).to include("Your organization has not set any Court Report Topics yet. Contact your admin to learn more.")
-        end
+      it "does not permit volunteer's supervisor to view the form" do
+        expect(supervisor.volunteers).to include(volunteer)
+        expect(casa_case.volunteers).to include(volunteer)
+        expect(case_contact.creator).to eq volunteer
+        request
+
+        expect(response).to redirect_to(root_path)
       end
     end
-    describe "supervisor view" do
-      before { sign_in supervisor }
 
-      context "details step - when an org has no topics" do
-        let(:organization) { create(:casa_org) }
-        let!(:case_contact) { create(:case_contact, :details_status, casa_case:, creator: supervisor) }
+    context "when user is casa admin" do
+      let(:user) { casa_admin }
 
-        it "guides supervisor to contact admin" do
-          page = request.parsed_body.to_html
-          expect(page).to include("Your organization has not set any Court Report Topics yet. Contact your admin to learn more.")
-        end
+      it "allows admin to view the form" do
+        expect(casa_case.volunteers).to include(volunteer)
+        expect(case_contact.creator).to eq volunteer
+        request
+
+        expect(response).to have_http_status(:success)
+        expect(response).to render_template(:details)
+      end
+    end
+
+    context "when step is not :details" do
+      subject(:request) { get case_contact_form_path(:notes, case_contact_id: case_contact.id) }
+
+      it "raises Wicked::Wizard::InvalidStepError" do
+        expect { request }.to raise_error(Wicked::Wizard::InvalidStepError)
       end
     end
   end
 
   describe "PATCH /update" do
-    before { sign_in admin }
-    let!(:casa_case) { create(:casa_case, casa_org: organization) }
-    let!(:case_contact) { create(:case_contact, :details_status, casa_case:) }
-    let(:advance_form) { true }
+    let(:case_contact) { create(:case_contact, :started_status, creator: volunteer) }
+    let(:contact_type_group) { create(:contact_type_group, casa_org:) }
+    let!(:contact_types) { create_list(:contact_type, 2, contact_type_group:) }
+    let(:medium_type) { CaseContact::CONTACT_MEDIUMS.second }
+    let(:contact_type_ids) { [contact_types.first.id] }
+    let(:draft_case_ids) { [casa_case.id] }
+
+    let(:required_attributes) do
+      {
+        draft_case_ids: draft_case_ids.map(&:to_s),
+        occurred_at: 3.days.ago.to_date, # iso format
+        medium_type:
+      }
+    end
+    let(:valid_attributes) do
+      required_attributes.merge({
+        contact_type_ids: contact_type_ids.map(&:to_s),
+        contact_made: "1",
+        duration_minutes: 50,
+        duration_hours: 1
+      })
+    end
+    let(:invalid_attributes) do
+      {occurred_at: 3.days.from_now, duration_minutes: 50, contact_made: true}
+    end
+    let(:attributes) { valid_attributes }
     let(:params) { {case_contact: attributes} }
 
-    subject(:request) do
-      patch "/case_contacts/#{case_contact.id}/form/#{step}", params: params
+    subject(:request) { patch "/case_contacts/#{case_contact.id}/form/details", params: params }
 
-      response
+    it "updates the requested case_contact attributes" do
+      case_contact.update!(duration_minutes: 5, contact_made: false, contact_type_ids: [contact_types.second.id])
+      submitted_hours = attributes[:duration_hours]
+      submitted_minutes = attributes[:duration_minutes]
+      submitted_minutes += (60 * submitted_hours) if submitted_hours
+      request
+
+      case_contact.reload
+      expect(case_contact.contact_type_ids).to contain_exactly(contact_types.first.id)
+      expect(case_contact.contact_made).to be true
+      expect(case_contact.duration_minutes).to eq submitted_minutes
     end
 
-    context "submitting details step" do
-      let!(:case_contact) { create(:case_contact, :started_status, creator: creator, contact_topic_answers: topic_answers) }
-      let(:topic_answers) { build_list(:contact_topic_answer, 3) }
-      let(:step) { :details }
-      let!(:contact_type_group_b) { create(:contact_type_group, casa_org: organization, name: "B") }
-      let!(:contact_types_b) do
-        [
-          create(:contact_type, name: "Teacher", contact_type_group: contact_type_group_b),
-          create(:contact_type, name: "Counselor", contact_type_group: contact_type_group_b)
-        ]
-      end
-
-      let!(:contact_type_group_a) { create(:contact_type_group, casa_org: organization, name: "A") }
-      let!(:contact_types_a) do
-        [
-          create(:contact_type, name: "Sibling", contact_type_group: contact_type_group_a),
-          create(:contact_type, name: "Parent", contact_type_group: contact_type_group_a)
-        ]
-      end
-
-      context "with valid attributes" do
-        let(:attributes) do
-          {
-            draft_case_ids: [casa_case.id],
-            occurred_at: 3.days.ago,
-            duration_minutes: 50,
-            contact_made: true,
-            medium_type: CaseContact::CONTACT_MEDIUMS.second,
-            contact_type_ids: contact_type_ids,
-            contact_topic_answers_attributes: topic_answers_attributes
-          }
-        end
-        let(:contact_type_ids) do
-          [contact_type_group_a.contact_types.first.id, contact_type_group_a.contact_types.second.id]
-        end
+    it "updates the requested contact_type_ids" do
+      expect(case_contact.contact_types).not_to include(contact_types.first)
+      request
 
-        let(:topic_answers_attributes) do
-          {
-            "0" => {id: topic_answers.first.id, value: "test", selected: true},
-            "1" => {id: topic_answers.second.id, value: "test", selected: true},
-            "2" => {id: topic_answers.third.id, value: "test", selected: true}
-          }
-        end
+      case_contact.reload
+      expect(case_contact.contact_types).to contain_exactly(contact_types.first)
+      expect(case_contact.contact_types.size).to eq 1
+    end
 
-        it "with valid attributes updates the requested case_contact" do
-          request
-          case_contact.reload
-          expect(case_contact.occurred_at).to eq(attributes[:occurred_at].floor)
-          expect(case_contact.duration_minutes).to eq(50)
-          expect(case_contact.contact_made).to eq(true)
-          expect(case_contact.medium_type).to eq(CaseContact::CONTACT_MEDIUMS.second)
-        end
+    it "sets the case_contact's casa_case_id and status: 'active'" do
+      expect(case_contact.casa_case_id).to be_nil
+      expect(case_contact.status).to eq "started"
+      request
 
-        it "updates only answer field for contact topics" do
-          request
-          case_contact.reload
+      case_contact.reload
+      expect(case_contact.status).to eq "active"
+      expect(case_contact.casa_case_id).to eq casa_case.id
+    end
 
-          expect(case_contact.contact_topic_answers.pluck(:value)).to be_all "test"
-          expect(case_contact.contact_topic_answers.pluck(:selected)).to be_all true
-        end
+    it "changes status to 'active' if it was 'started'" do
+      case_contact.update!(status: "started")
+      request
+      expect(case_contact.reload.status).to eq "active"
+    end
 
-        context "contact types" do
-          it "attaches contact types" do
-            request
-            case_contact.reload
-            expect(case_contact.contact_types.count).to eq 2
-            expect(case_contact.contact_types.map(&:id)).to include(contact_type_group_a.contact_types.first.id)
-            expect(case_contact.contact_types.map(&:id)).to include(contact_type_group_a.contact_types.second.id)
-          end
-
-          context "when updating contact types" do
-            let!(:old_contact_type) { create(:case_contact_contact_type, case_contact: case_contact, contact_type: contact_type_group_b.contact_types.first) }
-
-            it "removes unselected ones" do
-              expect(case_contact.contact_types.count).to eq 1
-              expect(case_contact.contact_types.map(&:id)).not_to include(contact_type_group_a.contact_types.first.id)
-              expect(case_contact.contact_types.map(&:id)).not_to include(contact_type_group_a.contact_types.second.id)
-
-              request
-              case_contact.reload
-              expect(case_contact.contact_types.count).to eq 2
-              expect(case_contact.contact_types.map(&:id)).to include(contact_type_group_a.contact_types.first.id)
-              expect(case_contact.contact_types.map(&:id)).to include(contact_type_group_a.contact_types.second.id)
-            end
-          end
-        end
+    it "raises RoutingError if no step in url" do
+      expect { patch "/case_contacts/#{case_contact.id}/form", params: {case_contact: attributes} }
+        .to raise_error(ActionController::RoutingError)
+    end
+
+    it "redirects to referrer (fallback /case_contacts?success=true)" do
+      request
+      expect(response).to have_http_status :redirect
+      expect(response).to redirect_to case_contacts_path(success: true)
+    end
+
+    context "with invalid attributes" do
+      let(:attributes) { invalid_attributes }
 
-        it { is_expected.to have_http_status(:redirect) }
+      it "does not update the requested case_contact" do
+        original_attributes = case_contact.attributes
+        request
+
+        expect(case_contact.reload).to have_attributes original_attributes
+        expect(case_contact.duration_minutes).not_to eq(50)
+        expect(case_contact.contact_made).not_to be(true)
       end
 
-      context "with missing attributes" do
-        let(:attributes) do
-          {
-            occurred_at: 3.days.ago,
-            duration_minutes: 50,
-            contact_made: true
-          }
-        end
+      it "re-renders the form" do
+        request
 
-        it "does not update the requested case_contact" do
-          request
-          expect(case_contact.duration_minutes).not_to eq(50)
-          expect(case_contact.contact_made).not_to eq(true)
-        end
+        # this should be a different status, but wicked wizard's 'render' method is a bit different?
+        expect(response).to have_http_status(:success)
+        expect(response).to render_template(:details)
+      end
+
+      it "does not change the contact status from 'started'" do
+        case_contact.started!
+        expect { request }.not_to change(case_contact, :status)
+        expect(case_contact.reload.status).to eq "started"
       end
     end
 
-    context "submitting notes step: contact topics" do
-      let!(:case_contact) { create(:case_contact, :details_status, creator: creator, contact_topic_answers: topic_answers) }
-      let(:topic_answers) { build_list(:contact_topic_answer, 3) }
-      let(:topic_answers_attributes) do
+    context "when contact types were previously assigned" do
+      before { case_contact.update!(contact_type_ids: [contact_types.second.id]) }
+
+      it "changes to contact types in params" do
+        expect(case_contact.contact_type_ids).to contain_exactly(contact_types.second.id)
+        request
+
+        case_contact.reload
+        expect(case_contact.contact_type_ids).to contain_exactly(contact_types.first.id)
+      end
+    end
+
+    context "when contact topic answers in params" do
+      let(:contact_topics) { create_list(:contact_topic, 3, casa_org:) }
+      let(:topic_one) { contact_topics.first }
+      let(:contact_topic_answers_attributes) do
         {
-          "0" => {id: topic_answers.first.id, value: "test", selected: true},
-          "1" => {id: topic_answers.second.id, value: "test", selected: true},
-          "2" => {id: topic_answers.third.id, value: "test", selected: true}
+          "0" => {contact_topic_id: topic_one.id, value: "Topic 1 Answer"},
+          "1" => {contact_topic_id: contact_topics.second.id, value: "Topic 2 Answer"},
+          "2" => {contact_topic_id: contact_topics.third.id, value: "Topic 3 Answer"}
         }
       end
-      let(:step) { :notes }
-      let(:attributes) do
-        {contact_topic_answers_attributes: topic_answers_attributes}
+
+      let(:attributes) { valid_attributes.merge({contact_topic_answers_attributes:}) }
+
+      it "creates contact topic answers" do
+        expect(attributes[:contact_topic_answers_attributes]).to eq contact_topic_answers_attributes
+        request
+
+        case_contact.reload
+        expect(case_contact.contact_topic_answers.size).to eq 3
+        expect(case_contact.contact_topic_answers.pluck(:value))
+          .to contain_exactly("Topic 1 Answer", "Topic 2 Answer", "Topic 3 Answer")
+        expect(case_contact.contact_topics.flat_map(&:id)).to match_array(contact_topics.collect(&:id))
       end
 
-      context "with valid contact topic answers" do
-        context "when submitting via button" do
-          it "updates the requested case_contact" do
-            request
-            case_contact.reload
+      context "when answer exists for the same contact topic" do
+        let!(:contact_topic_one_answer) do
+          create(:contact_topic_answer, value: "Original Discussion Topic Answer.", contact_topic: topic_one, case_contact:)
+        end
+
+        it "overwrites existing answer with id in answer attributes" do
+          contact_topic_answers_attributes["0"][:id] = contact_topic_one_answer.id
+          expect(case_contact.contact_topic_answers.size).to eq 1
+          request
 
-            expect(case_contact.contact_topic_answers.pluck(:value)).to be_all "test"
-            expect(case_contact.contact_topic_answers.pluck(:selected)).to be_all true
-          end
+          case_contact.reload
+          topic_one_contact_answers = case_contact.contact_topic_answers.where(contact_topic: topic_one)
+          expect(topic_one_contact_answers.size).to eq 1
+          expect(case_contact.contact_topic_answers.size).to eq 3
+          expect(topic_one_contact_answers.first.value).to eq "Topic 1 Answer"
         end
+      end
+    end
+
+    context "when notes attribute in params" do
+      let(:notes) { "This is a note." }
+      let(:attributes) { valid_attributes.merge({notes:}) }
 
-        context "when autosaving" do
-          subject(:request) do
-            patch "/case_contacts/#{case_contact.id}/form/#{step}", params:, as: :json
+      it "updates the requested case_contact" do
+        request
 
-            response
-          end
+        case_contact.reload
+        expect(case_contact.notes).to eq "This is a note."
+      end
+    end
 
-          it "updates the requested case_contact" do
-            request
-            case_contact.reload
+    it "does not send reimbursement email for non-reimbursement case contacts" do
+      expect(attributes[:want_driving_reimbursement]).to be_nil
 
-            expect(case_contact.contact_topic_answers.pluck(:value)).to be_all "test"
-            expect(case_contact.contact_topic_answers.pluck(:selected)).to be_all true
-          end
+      expect { request }.not_to have_enqueued_job(ActionMailer::MailDeliveryJob)
+    end
 
-          it { is_expected.to have_http_status(:success) }
-        end
+    context "when no volunteer address in params" do
+      before { volunteer.create_address!(content: "123 Before St") }
+
+      it "does not update the volunteer's address" do
+        expect(attributes[:volunteer_address]).to be_nil
+        request
+
+        expect(case_contact.reload.volunteer_address).to be_nil
+        expect(volunteer.reload.address.content).to eq "123 Before St"
       end
     end
 
-    context "submitting notes step" do
-      let!(:case_contact) { create(:case_contact, :details_status, creator: creator) }
-      let(:step) { :notes }
+    context "when blank volunteer address in params" do
+      let(:attributes) { valid_attributes.merge({volunteer_address: ""}) }
 
-      context "with valid attributes" do
-        let(:attributes) do
-          {
-            notes: "This is a note."
-          }
-        end
+      before { volunteer.create_address!(content: "123 Before St") }
+
+      it "does not update the volunteer's address" do
+        expect(attributes[:volunteer_address]).to eq ""
+        request
+
+        expect(case_contact.reload.volunteer_address).to be_empty
+        expect(volunteer.reload.address.content).to eq "123 Before St"
+      end
+    end
 
-        context "when submitting via button" do
-          it "updates the requested case_contact" do
-            request
-            case_contact.reload
-            expect(case_contact.notes).to eq "This is a note."
-          end
+    context "when reimbursement info is in params" do
+      let(:attributes) do
+        valid_attributes.merge({
+          want_driving_reimbursement: true,
+          miles_driven: 60,
+          volunteer_address: "123 Params St"
+        })
+      end
 
-          it "does not override other attributes" do
-            request
-            case_contact.reload
-            expect(case_contact.duration_minutes).to eq 60
-          end
+      it "updates the case contact with the info" do
+        request
 
-          it { is_expected.to have_http_status(:redirect) }
-        end
+        case_contact.reload
+        expect(case_contact.want_driving_reimbursement).to be true
+        expect(case_contact.miles_driven).to eq 60
+        expect(case_contact.volunteer_address).to eq "123 Params St"
+      end
 
-        context "when autosaving" do
-          subject(:request) do
-            patch "/case_contacts/#{case_contact.id}/form/#{step}", params: params, as: :json
+      it "sends reimbursement email" do
+        expect {
+          request
+        }.to change { have_enqueued_job(ActionMailer::MailDeliveryJob).with("SupervisorMailer", "reimbursement_request_email", volunteer, supervisor) }
+      end
 
-            response
-          end
+      it "updates the volunteer's address with the new address" do
+        expect(user).to eq volunteer
+        expect(attributes[:volunteer_address]).to eq "123 Params St"
+        request
 
-          it "updates the requested case_contact" do
-            request
-            case_contact.reload
-            expect(case_contact.notes).to eq "This is a note."
-          end
+        expect(case_contact.reload.volunteer_address).to eq "123 Params St"
+        expect(volunteer.reload.address.content).to eq "123 Params St"
+      end
 
-          it "does not override other attributes" do
-            request
-            case_contact.reload
-            expect(case_contact.duration_minutes).to eq 60
-          end
+      context "when admin edits volunteer contact" do
+        let(:user) { casa_admin }
 
-          it { is_expected.to have_http_status(:success) }
+        it "changes the volunteer address, not the admin's" do
+          casa_admin.create_address!(content: "321 Admin Ave")
+          expect(attributes[:volunteer_address]).to eq "123 Params St"
+          request
+
+          expect(case_contact.reload.volunteer_address).to eq "123 Params St"
+          expect(volunteer.reload.address.content).to eq "123 Params St"
+          expect(casa_admin.reload.address&.content).to eq "321 Admin Ave"
         end
       end
-    end
 
-    context "submitting expenses step" do
-      let!(:case_contact) { create(:case_contact, :notes_status, draft_case_ids: [casa_case.id], creator: creator, contact_topic_answers: topic_answers) }
-      let(:case_contact_topics) { build_list(:contact_topic_answer, 3) }
-      let(:topic_answers) { build_list(:contact_topic_answer, 3) }
-      let(:topic_answers_attributes) do
-        {
-          "0" => {id: topic_answers.first.id, value: "test", selected: true},
-          "1" => {id: topic_answers.second.id, value: "test", selected: true},
-          "2" => {id: topic_answers.third.id, value: "test", selected: true}
-        }
+      context "when supervisor edits volunteer contact" do
+        let(:user) { supervisor }
+
+        it "changes the volunteer address, not the supervisor's" do
+          supervisor.create_address!(content: "321 Super Ave")
+          expect(attributes[:volunteer_address]).to eq "123 Params St"
+          request
+
+          expect(case_contact.reload.volunteer_address).to eq "123 Params St"
+          expect(volunteer.reload.address.content).to eq "123 Params St"
+          expect(supervisor.reload.address&.content).to eq "321 Super Ave"
+        end
       end
-      let(:additional_expenses) do
+    end
+
+    context "when additional expenses in params" do
+      let(:additional_expenses_attributes) do
         {
           "0" => {other_expense_amount: 50, other_expenses_describe: "meal"},
           "1" => {other_expense_amount: 100, other_expenses_describe: "hotel"}
         }
       end
-      let(:step) { :expenses }
-
-      context "with valid attributes" do
-        let(:attributes) do
-          {
-            want_driving_reimbursement: true,
-            miles_driven: 60,
-            volunteer_address: "123 str",
-            additional_expenses_attributes: additional_expenses,
-            contact_topic_answers_attributes: topic_answers_attributes
-          }
-        end
+      let(:attributes) { valid_attributes.merge({additional_expenses_attributes:}) }
+
+      it "creates additional expenses for the case contact" do
+        request
+
+        case_contact.reload
+        expect(case_contact.additional_expenses.first.other_expense_amount).to eq 50
+        expect(case_contact.additional_expenses.first.other_expenses_describe).to eq "meal"
+        expect(case_contact.additional_expenses.last.other_expense_amount).to eq 100
+        expect(case_contact.additional_expenses.last.other_expenses_describe).to eq "hotel"
+      end
+
+      it "succeeds when wants_driving_reimbursement is not true" do
+        case_contact.update!(want_driving_reimbursement: false)
+        attributes[:want_driving_reimbursement] = "0"
+        request
+
+        expect(case_contact.reload.additional_expenses.size).to eq 2
+      end
+    end
+
+    context "when json request (autosave)" do
+      subject(:request) do
+        patch "/case_contacts/#{case_contact.id}/form/details", params:, as: :json
+
+        response
+      end
+
+      it { is_expected.to have_http_status(:success) }
+
+      it "updates with the attributes" do
+        request
+
+        case_contact.reload
+        expect(case_contact.occurred_at).to eq(attributes[:occurred_at])
+        expect(case_contact.contact_made).to be true
+      end
+
+      it "does not change status" do
+        expect(case_contact.status).to eq "started"
+        request
+
+        expect(case_contact.reload.status).to eq "started"
+      end
+
+      context "when contact is in details status" do
+        let(:case_contact) { create(:case_contact, :details_status, casa_case:, creator: volunteer) }
 
-        it "updates the requested case_contact" do
+        it "does not change status" do
+          expect(case_contact.status).to eq "details"
           request
-          case_contact.reload
-          expect(case_contact.want_driving_reimbursement).to be_truthy
-          expect(case_contact.miles_driven).to eq 60
-          expect(case_contact.volunteer_address).to eq "123 str"
-          expect(case_contact.additional_expenses.count).to eq 2
-          expect(case_contact.additional_expenses.first.other_expense_amount).to eq 50
-          expect(case_contact.additional_expenses.first.other_expenses_describe).to eq "meal"
-          expect(case_contact.additional_expenses.last.other_expense_amount).to eq 100
-          expect(case_contact.additional_expenses.last.other_expenses_describe).to eq "hotel"
-          expect(case_contact.contact_topic_answers.pluck(:value)).to be_all "test"
-          expect(case_contact.contact_topic_answers.pluck(:selected)).to be_all true
+
+          expect(case_contact.reload.status).to eq "details"
         end
+      end
 
-        it "sets the case_contact's status to active" do
-          request
-          case_contact.reload
+      context "when contact is in active status" do
+        let(:case_contact) { create(:case_contact, casa_case:, creator: volunteer) }
+
+        it "does not change the status" do
           expect(case_contact.status).to eq "active"
+          request
+
+          expect(case_contact.reload.status).to eq "active"
         end
+      end
 
-        it "sets the casa_case_id" do
-          expect(case_contact.casa_case_id).to be_nil
-          request
-          case_contact.reload
-          expect(case_contact.casa_case_id).to eq casa_case.id
+      context "when attribute is invalid" do
+        let(:attributes) { invalid_attributes }
+
+        it "does not update the requested case_contact" do
+          expect { request }.not_to change(case_contact.reload, :attributes)
         end
 
-        context "with only one volunteer for the first case" do
-          let!(:case_assignment) { create(:case_assignment, casa_case: casa_case, volunteer: volunteer) }
+        it "responds :unprocessable_entity and returns the errors" do
+          request
 
-          it "updates the volunteer's address" do
-            request
-            expect(volunteer.address.content).to eq "123 str"
-          end
+          expect(response).to have_http_status(:unprocessable_entity)
         end
+      end
+    end
 
-        context "with volunteer submitting" do
-          let(:creator) { volunteer }
+    context "when metadata create_another attribute is truthy" do
+      let(:attributes) { valid_attributes.merge({metadata: {create_another: "1"}}) }
 
-          it "updates the volunteer's address" do
-            request
-            expect(volunteer.address.content).to eq "123 str"
-          end
+      it "redirects to contact form with the same draft_case_id, ignore_referer" do
+        expect(attributes[:draft_case_ids]).to be_present
 
-          it "sends reimbursement email" do
-            expect {
-              request
-            }.to change { have_enqueued_job(ActionMailer::MailDeliveryJob).with("SupervisorMailer", "reimbursement_request_email", volunteer, supervisor) }
-          end
-        end
+        request
+        expect(response).to have_http_status :redirect
+        expect(response).to redirect_to(
+          new_case_contact_path(draft_case_ids: attributes[:draft_case_ids], ignore_referer: true)
+        )
+      end
+    end
 
-        it "redirects to referrer (fallback) page" do
-          expect(request).to have_http_status :redirect
-          expect(request).to redirect_to case_contacts_path(success: true)
-        end
+    context "with multiple cases selected" do
+      let!(:second_casa_case) { create(:casa_case, casa_org:, volunteers: [volunteer]) }
+      let!(:third_casa_case) { create(:casa_case, casa_org:, volunteers: [volunteer]) }
+      let(:draft_case_ids) { [casa_case.id, second_casa_case.id, third_casa_case.id] }
+
+      it "copies the contact attributes for each contact" do
+        expect { request }.to change(CaseContact.active, :count).by(3)
+
+        original_case_contact = case_contact.reload
+        second_case_contact = CaseContact.active.where(casa_case_id: second_casa_case.id).first
+        third_case_contact = CaseContact.active.where(casa_case_id: third_casa_case.id).first
+
+        unique_columns = ["id", "casa_case_id", "created_at", "updated_at", "draft_case_ids", "metadata"]
+        copied_attrs = original_case_contact.attributes.except(*unique_columns)
+        expect([second_case_contact, third_case_contact]).to all have_attributes copied_attrs
+      end
+
+      it "sets casa_case and draft_case_ids per contact" do
+        expect { request }.to change(CaseContact.active, :count).by(3)
+
+        second_case_contact = CaseContact.active.where(casa_case_id: second_casa_case.id).first
+        third_case_contact = CaseContact.active.where(casa_case_id: third_casa_case.id).first
 
-        context "when create_another option is truthy" do
-          let(:draft_case_ids) { case_contact.draft_case_ids }
+        expect(case_contact.reload.casa_case_id).to eq draft_case_ids.first
+        expect(case_contact.draft_case_ids).to contain_exactly draft_case_ids.first
+        expect(second_case_contact.casa_case_id).to eq draft_case_ids.second
+        expect(second_case_contact.draft_case_ids).to contain_exactly draft_case_ids.second
+        expect(third_case_contact.casa_case_id).to eq draft_case_ids.third
+        expect(third_case_contact.draft_case_ids).to contain_exactly draft_case_ids.third
+      end
+
+      it "sets contact_type_ids for all contacts" do
+        expect { request }.to change(CaseContact.active, :count).by(3)
 
-          before { params[:case_contact][:metadata] = {create_another: "1"} }
+        contacts = CaseContact.active.last(3)
+        expect(contacts.collect(&:contact_type_ids)).to all match_array(contact_type_ids)
+      end
 
-          it "redirects to contact form with the same draft_case_id, ignore_referer" do
-            expect(request).to have_http_status :redirect
-            expect(request).to redirect_to(
-              new_case_contact_path(draft_case_ids:, ignore_referer: true)
-            )
-          end
+      it "copies contact_topic answers for the cases" do
+        case_contact.contact_topic_answers.create!(contact_topic: contact_topics.first, value: "test answer")
+        expect { request }.to change(CaseContact.active, :count).by(3)
+
+        contacts = CaseContact.active.last(3)
+        contacts.each do |contact|
+          expect(contact.contact_topic_answers.first.contact_topic_id).to eq contact_topics.first.id
+          expect(contact.contact_topic_answers.first.value).to eq "test answer"
         end
+      end
 
-        context "with multiple cases selected" do
-          let!(:other_casa_case) { create(:casa_case, casa_org: organization) }
-          let!(:case_contact) {
-            create(:case_contact, :notes_status, draft_case_ids: [casa_case.id, other_casa_case.id],
-              creator: admin, contact_topic_answers: topic_answers)
-          }
-
-          it "creates a copy of the draft for each case" do
-            expect {
-              request
-            }.to change(CaseContact, :count).by(1)
-            expect(CaseContact.last.casa_case_id).to eq other_casa_case.id
-            expect(CaseContact.last.draft_case_ids).to eq [other_casa_case.id]
-            expect(CaseContact.last.status).to eq "active"
-          end
-
-          it "sets contact_topics for all cases" do
-            expect { request }.to change(ContactTopicAnswer, :count).by(3)
-            expect(CaseContact.last.contact_topic_answers.pluck(:value)).to be_all("test")
-            expect(CaseContact.last.contact_topic_answers.pluck(:selected)).to be_all(true)
-          end
-
-          it "sets the draft_case_ids of the draft to only the first case" do
-            expect(case_contact.draft_case_ids.count).to eq 2
-            request
-            case_contact.reload
-            expect(case_contact.draft_case_ids.count).to eq 1
-            expect(case_contact.draft_case_ids).to eq [casa_case.id]
-          end
-
-          it "redirects to referrer (fallback) page" do
-            expect(request).to have_http_status :redirect
-            expect(request).to redirect_to case_contacts_path(success: true)
-          end
-
-          context "when create_another option is truthy" do
-            before { params[:case_contact][:metadata] = {create_another: "1"} }
-
-            it "redirects to new contact with the same draft_case_ids, ignore_referer" do
-              draft_case_ids = case_contact.draft_case_ids
-              expect(request).to have_http_status :redirect
-              expect(request).to redirect_to(
-                new_case_contact_path(draft_case_ids:, ignore_referer: true)
-              )
-            end
-          end
+      it "redirects to referrer (fallback) page" do
+        request
+        expect(response).to have_http_status :redirect
+        expect(response).to redirect_to case_contacts_path(success: true)
+      end
+
+      context "when create_another option is truthy" do
+        before { params[:case_contact][:metadata] = {create_another: "1"} }
+
+        it "redirects to new contact with the same draft_case_ids, :ignore_referer" do
+          request
+          expect(response).to have_http_status :redirect
+          expect(response).to redirect_to new_case_contact_path(draft_case_ids:, ignore_referer: true)
         end
       end
     end
diff --git a/spec/requests/case_contacts_spec.rb b/spec/requests/case_contacts_spec.rb
index c484e35913..bf4447c115 100644
--- a/spec/requests/case_contacts_spec.rb
+++ b/spec/requests/case_contacts_spec.rb
@@ -46,30 +46,25 @@
 
     it { is_expected.to have_http_status(:redirect) }
 
-    it "creates a new case contact" do
-      expect {
-        request
-      }.to change(CaseContact, :count).by(1)
+    it "creates a 'started' status case contact and redirects to the form" do
+      expect { request }.to change(CaseContact, :count).by(1)
+      new_case_contact = CaseContact.last
+      expect(new_case_contact.status).to eq "started"
+      expect(response).to redirect_to(case_contact_form_path(:details, case_contact_id: new_case_contact.id))
     end
 
     context "when current org has contact topics" do
-      let(:contact_topics) {
-        [
-          build(:contact_topic, active: true, soft_delete: false),
-          build(:contact_topic, active: false, soft_delete: false),
-          build(:contact_topic, active: true, soft_delete: true),
-          build(:contact_topic, active: false, soft_delete: true)
-        ]
-      }
+      let(:contact_topics) do
+        [build(:contact_topic, active: true, soft_delete: false)]
+      end
       let(:organization) { create(:casa_org, contact_topics:) }
 
-      it "should set empty contact topic answers for new case contact to active/non-softdelet org topics" do
-        expect { request }.to change(ContactTopicAnswer, :count).by(1)
-
-        got = CaseContact.last.contact_topic_answers.first.contact_topic.question
-        expect(got).to eq(contact_topics[0].question)
+      it "does not create contact topic answers" do
+        expect { request }
+          .to change(CaseContact.started, :count).by(1)
+          .and not_change(ContactTopicAnswer, :count)
 
-        expect(CaseContact.last.contact_topic_answers.first.value).to be_nil
+        expect(CaseContact.started.last.contact_topic_answers).to be_empty
       end
     end
   end
@@ -84,6 +79,11 @@
     end
 
     it { is_expected.to have_http_status(:redirect) }
+
+    it "redirects to case contact form" do
+      request
+      expect(response).to redirect_to(case_contact_form_path(:details, case_contact_id: case_contact.id))
+    end
   end
 
   describe "GET /drafts" do
diff --git a/spec/requests/contact_topic_answers_spec.rb b/spec/requests/contact_topic_answers_spec.rb
new file mode 100644
index 0000000000..17d30acdd1
--- /dev/null
+++ b/spec/requests/contact_topic_answers_spec.rb
@@ -0,0 +1,97 @@
+require "rails_helper"
+
+RSpec.describe "/contact_topic_answers", type: :request do
+  let(:casa_org) { create :casa_org }
+  let(:contact_topic) { create :contact_topic, casa_org: }
+  let(:casa_admin) { create :casa_admin, casa_org: }
+  let(:supervisor) { create :supervisor, casa_org: }
+  let(:volunteer) { create :volunteer, :with_single_case, supervisor:, casa_org: }
+  let(:user) { volunteer }
+  let(:casa_case) { volunteer.casa_cases.first }
+  let(:case_contact) { create :case_contact, casa_case:, creator: volunteer }
+
+  let(:valid_attributes) do
+    attributes_for(:contact_topic_answer)
+      .merge({contact_topic_id: contact_topic.id, case_contact_id: case_contact.id})
+  end
+  let(:invalid_attributes) { valid_attributes.merge({contact_topic_id: nil, value: "something"}) }
+
+  before { sign_in user }
+
+  describe "POST /create" do
+    let(:new_attributes) { valid_attributes.except(:value) }
+    let(:params) { {contact_topic_answer: new_attributes} }
+
+    subject { post contact_topic_answers_path, params:, as: :json }
+
+    it "creates a record and responds created" do
+      expect { subject }.to change(ContactTopicAnswer, :count).by(1)
+      expect(response).to have_http_status(:created)
+    end
+
+    it "returns the record as json" do
+      subject
+      expect(response.content_type).to match(a_string_including("application/json"))
+      answer = ContactTopicAnswer.last
+      expect(response_json[:id]).to eq answer.id
+      expect(response_json.keys)
+        .to contain_exactly(:id, :contact_topic_id, :value, :case_contact_id, :created_at, :updated_at, :selected)
+    end
+
+    context "as casa_admin" do
+      let(:user) { casa_admin }
+
+      it "creates a record and responds created" do
+        expect { subject }.to change(ContactTopicAnswer, :count).by(1)
+        expect(response).to have_http_status(:created)
+      end
+    end
+
+    context "with invalid parameters" do
+      let(:params) { {contact_topic_answer: invalid_attributes} }
+
+      it "fails and responds unprocessable_entity" do
+        expect { subject }.to change(ContactTopicAnswer, :count).by(0)
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it "returns errors as json" do
+        subject
+        expect(response.content_type).to match(a_string_including("application/json"))
+        expect(response.body).to be_present
+        expect(response_json[:contact_topic]).to include("must be selected")
+      end
+    end
+
+    context "html request" do
+      subject { post contact_topic_answers_path, params: }
+
+      it "redirects to referrer/root without creating a contact topic answer" do
+        expect { subject }.to not_change(ContactTopicAnswer, :count)
+        expect(response).to redirect_to(root_url)
+      end
+    end
+  end
+
+  describe "DELETE /destroy" do
+    let!(:contact_topic_answer) { create :contact_topic_answer, case_contact:, contact_topic: }
+
+    subject { delete contact_topic_answer_url(contact_topic_answer), as: :json }
+
+    it "destroys the record and responds no content" do
+      expect { subject }
+        .to change(ContactTopicAnswer, :count).by(-1)
+      expect(response).to have_http_status(:no_content)
+      expect(response.body).to be_empty
+    end
+
+    context "html request" do
+      subject { delete contact_topic_answer_url(contact_topic_answer) }
+
+      it "redirects to referrer/root without destroying the contact topic answer" do
+        expect { subject }.to not_change(ContactTopicAnswer, :count)
+        expect(response).to redirect_to(root_url)
+      end
+    end
+  end
+end
diff --git a/spec/support/fill_in_case_contact_fields.rb b/spec/support/fill_in_case_contact_fields.rb
index 67e6093f19..bc462f336e 100644
--- a/spec/support/fill_in_case_contact_fields.rb
+++ b/spec/support/fill_in_case_contact_fields.rb
@@ -1,77 +1,120 @@
 module FillInCaseContactFields
-  # @param case_numbers [Array[String]]
-  # @param contact_types [Array[String]]
-  # @param contact_made [Boolean]
-  # @param medium [String]
-  # @param occurred_on [String], date in the format MM/dd/YYYY
-  # @param hours [Integer]
-  # @param minutes [Integer]
-  def complete_details_page(contact_made:, medium: nil, occurred_on: nil, hours: nil, minutes: nil, case_numbers: [], contact_types: [], contact_topics: [])
-    within find("#draft-case-id-selector") do
-      find(".ts-control").click
+  DETAILS_ID = "#contact-form-details"
+  NOTES_ID = "#contact-form-notes"
+  TOPIC_VALUE_CLASS = ".contact-topic-answer-input"
+  TOPIC_SELECT_CLASS = ".contact-topic-id-select"
+  REIMBURSEMENT_ID = "#contact-form-reimbursement"
+  EXPENSE_AMOUNT_CLASS = ".expense-amount-input"
+  EXPENSE_DESCRIBE_CLASS = ".expense-describe-input"
+
+  def fill_in_contact_details(case_numbers: [], contact_types: [], contact_made: true,
+    medium: "In Person", occurred_on: Time.zone.today, hours: nil, minutes: nil)
+    within DETAILS_ID do
+      within "#draft-case-id-selector" do
+        if case_numbers.nil?
+          all(:element, "a", title: "Remove this item").each(&:click)
+        end
+
+        if case_numbers.present?
+          find(".ts-control").click
+
+          Array.wrap(case_numbers).each_with_index do |case_number, index|
+            checkbox_for_case_number = first("span", text: case_number).sibling("input")
+            checkbox_for_case_number.click unless checkbox_for_case_number.checked?
+          end
+
+          find(".ts-control").click
+        end
+      end
+
+      fill_in "case_contact_occurred_at", with: occurred_on if occurred_on
+
+      if contact_types.present?
+        contact_types.each do |contact_type|
+          check contact_type
+        end
+      elsif !contact_types.nil?
+        contact_type = ContactType.first
+        check contact_type.name
+      end
+
+      choose medium if medium
+
+      if contact_made
+        check "Contact was made"
+      else
+        uncheck "Contact was made"
+      end
+
+      fill_in "case_contact_duration_hours", with: hours if hours
+      fill_in "case_contact_duration_minutes", with: minutes if minutes
     end
-
-    case_numbers.each do |case_number|
-      checkbox_for_case_number = find("span", text: case_number).sibling("input")
-      checkbox_for_case_number.click unless checkbox_for_case_number.checked?
-    end
-
-    within find("#draft-case-id-selector") do
-      find(".ts-control").click
-    end
-
-    within find("#contact-type-id-selector") do
-      find(".ts-control").click
+  end
+  alias_method :complete_details_page, :fill_in_contact_details
+
+  def fill_in_notes(notes: nil, contact_topic_answers_attrs: [])
+    within NOTES_ID do
+      Array.wrap(contact_topic_answers_attrs).each_with_index do |attributes, index|
+        click_on "Add Another Discussion Topic" if index > 0
+        answer_topic_unscoped attributes[:question], attributes[:answer]
+      end
+
+      if notes.present?
+        fill_in "Additional Notes", with: notes
+      end
     end
+  end
+  alias_method :complete_notes_page, :fill_in_notes
 
-    contact_types.each do |contact_type|
-      find("span", text: contact_type).click
-    end
+  # @param miles [Integer]
+  # @param want_reimbursement [Boolean]
+  # @param address [String]
+  def fill_in_mileage(miles: 0, want_reimbursement: false, address: nil)
+    within REIMBURSEMENT_ID do
+      check_reimbursement(want_reimbursement)
+      return unless want_reimbursement
 
-    within find("#contact-type-id-selector") do
-      find(".ts-control").click
+      fill_in "case_contact_miles_driven", with: miles if miles.present?
+      fill_in "case_contact_volunteer_address", with: address if address
     end
+  end
+  alias_method :fill_in_expenses_page, :fill_in_mileage
 
-    within "#enter-contact-details" do
-      choose contact_made ? "Yes" : "No"
-    end
+  def choose_medium(medium)
     choose medium if medium
-    fill_in "case_contact_occurred_at", with: occurred_on if occurred_on
-    fill_in "case_contact_duration_hours", with: hours if hours
-    fill_in "case_contact_duration_minutes", with: minutes if minutes
+  end
 
-    contact_topics.each do |contact_topic|
-      check contact_topic
+  def check_reimbursement(want_reimbursement = true)
+    if want_reimbursement
+      check "Request travel or other reimbursement"
+    else
+      uncheck "Request travel or other reimbursement"
     end
-
-    click_on "Save and Continue"
   end
 
-  def choose_medium(medium, click_continue: true)
-    choose medium if medium
-
-    click_on "Save and Continue" if click_continue
+  def fill_expense_fields(amount, describe, index: nil)
+    within REIMBURSEMENT_ID do
+      amount_field = index.present? ? all(EXPENSE_AMOUNT_CLASS)[index] : all(EXPENSE_AMOUNT_CLASS).last
+      describe_field = index.present? ? all(EXPENSE_DESCRIBE_CLASS)[index] : all(EXPENSE_DESCRIBE_CLASS).last
+      amount_field.fill_in(with: amount) if amount
+      describe_field.fill_in(with: describe) if describe
+    end
   end
 
-  # @param notes [String]
-  def complete_notes_page(notes: "", click_continue: true)
-    fill_in "Additional notes", with: notes
-
-    click_on "Save and Continue" if click_continue
+  def answer_topic(question, answer, index: nil)
+    within NOTES_ID do
+      answer_topic_unscoped(question, answer, index:)
+    end
   end
 
-  # This intentionally does not submit the form
-  # @param miles [Integer]
-  # @param want_reimbursement [Boolean]
-  # @param address [String]
-  def fill_in_expenses_page(miles: 0, want_reimbursement: false, address: nil)
-    fill_in "case_contact_miles_driven", with: miles
-
-    within ".want-driving-reimbursement" do
-      choose want_reimbursement ? "Yes" : "No"
-    end
+  private
 
-    fill_in "case_contact_volunteer_address", with: address if address
+  # use when already 'within' notes div
+  def answer_topic_unscoped(question, answer, index: nil)
+    topic_select = index.nil? ? all(TOPIC_SELECT_CLASS).last : all(TOPIC_SELECT_CLASS)[index]
+    answer_field = index.nil? ? all(TOPIC_VALUE_CLASS).last : all(TOPIC_VALUE_CLASS)[index]
+    topic_select.select(question) if question
+    answer_field.fill_in(with: answer) if answer
   end
 end
 
diff --git a/spec/support/request_helpers.rb b/spec/support/request_helpers.rb
new file mode 100644
index 0000000000..1d089bf3fc
--- /dev/null
+++ b/spec/support/request_helpers.rb
@@ -0,0 +1,7 @@
+module Support
+  module RequestHelpers
+    def response_json
+      @response_json ||= JSON.parse(response.body, symbolize_names: true)
+    end
+  end
+end
diff --git a/spec/system/casa_cases/index_spec.rb b/spec/system/casa_cases/index_spec.rb
index 032d8273db..77526779c5 100644
--- a/spec/system/casa_cases/index_spec.rb
+++ b/spec/system/casa_cases/index_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe "casa_cases/index", type: :system do
   let(:organization) { create(:casa_org) }
-  let(:volunteer) { build(:volunteer, display_name: "Bob Loblaw", casa_org: organization) }
+  let(:volunteer) { create(:volunteer, display_name: "Bob Loblaw", casa_org: organization) }
   let(:case_number) { "CINA-1" }
 
   it "is filterable and linkable", :js do
diff --git a/spec/system/case_contacts/additional_expenses_spec.rb b/spec/system/case_contacts/additional_expenses_spec.rb
index 65c31f74d8..995b770d85 100644
--- a/spec/system/case_contacts/additional_expenses_spec.rb
+++ b/spec/system/case_contacts/additional_expenses_spec.rb
@@ -1,295 +1,161 @@
 require "rails_helper"
-require "action_view"
 
-RSpec.describe "additional_expenses", type: :system, flipper: true do
-  let(:organization) { build(:casa_org, additional_expenses_enabled: true) }
-  let(:volunteer) { create(:volunteer, casa_org: organization) }
-  let(:casa_case) { create(:casa_case, casa_org: organization) }
+RSpec.describe "CaseContact AdditionalExpenses Form", :flipper, :js, type: :system do
+  let(:casa_org) { build :casa_org, :all_reimbursements_enabled }
+  let(:volunteer) { create :volunteer, :with_single_case, casa_org: }
+  let(:casa_case) { volunteer.casa_cases.first }
+  let!(:contact_type) { create :contact_type, casa_org: }
 
   before do
     allow(Flipper).to receive(:enabled?).with(:show_additional_expenses).and_return(true)
-    create(:case_assignment, casa_case: casa_case, volunteer: volunteer)
-  end
-
-  it "additional expenses and notices can be set per organization", js: true do
-    other_organization = build(:casa_org)
-    other_volunteer = create(:volunteer, casa_org: other_organization)
-    other_casa_case = create(:casa_case, casa_org: other_organization)
-    create(:case_assignment, casa_case: other_casa_case, volunteer: other_volunteer)
-
-    allow(Flipper).to receive(:enabled?).with(:reimbursement_warning, organization).and_return(true)
-
     sign_in volunteer
-    visit casa_case_path(casa_case.id)
-    click_on "New Case Contact"
-
-    complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "Video", occurred_on: "04/04/2020", hours: 1, minutes: 45)
-    complete_notes_page
-
-    expect(page).to have_text("Other Expenses")
-    expect(page).to have_text("Volunteers are eligible to be reimbursed for case-related travel")
-
-    sign_in other_volunteer
-    visit casa_case_path(other_casa_case.id)
-    click_on "New Case Contact"
-
-    complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "Video", occurred_on: "04/04/2020", hours: 1, minutes: 45)
-    complete_notes_page
-
-    expect(page).not_to have_text("Other Expenses")
-    expect(page).not_to have_text("Volunteers are eligible to be reimbursed for case-related travel")
   end
 
-  context "when setting additional expenses" do
-    let(:contact_type_group) { build(:contact_type_group, casa_org: organization) }
-
-    before do
-      create(:contact_type)
-      create(:contact_type, name: "School", contact_type_group: contact_type_group)
-    end
-
-    it "additional expenses fields appearance", js: true do
-      sign_in volunteer
-
-      visit casa_case_path(casa_case.id)
-
-      click_on "New Case Contact"
-
-      complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "Video", occurred_on: "04/04/2020", hours: 1, minutes: 45)
-      complete_notes_page
-
-      expect(page).to have_text("Add Another Expense")
-
-      expect(page).to have_field("case_contact_additional_expenses_attributes_0_other_expense_amount")
-      expect(page).to have_no_field("case_contact_additional_expenses_attributes_1_other_expense_amount")
-      find_by_id("case_contact_additional_expenses_attributes_0_other_expense_amount").fill_in(with: "5.34")
-      find_by_id("case_contact_additional_expenses_attributes_0_other_expenses_describe").fill_in(with: "Lunch")
-
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(1).and change(AdditionalExpense, :count).by(1)
-
-      visit edit_case_contact_path(casa_case.reload.case_contacts.last)
-      complete_details_page(contact_made: true)
-      complete_notes_page
-
-      expect(page).to have_field("case_contact_additional_expenses_attributes_0_other_expense_amount", with: "5.34")
-      expect(page).to have_field("case_contact_additional_expenses_attributes_0_other_expenses_describe", with: "Lunch")
-
-      expect(page).to have_text("Add Another Expense")
-    end
-
-    it "additional expenses for multiple entries", js: true do
-      sign_in volunteer
-
-      visit casa_case_path(casa_case.id)
-
-      click_on "New Case Contact"
-
-      complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "Video", occurred_on: "04/04/2020", hours: 1, minutes: 45)
-      complete_notes_page
-
-      expect(page).to have_text("Add Another Expense")
-
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 1)
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']", count: 1)
-
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']").first.fill_in(with: "7.21")
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']").first.fill_in(with: "Toll")
-
-      find_by_id("add-another-expense").click
-
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 2)
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']", count: 2)
-
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']").last.fill_in(with: "7.22")
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']").last.fill_in(with: "Another Toll")
-
-      expect(page).to have_text("Add Another Expense")
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(1).and change(AdditionalExpense, :count).by(2)
-
-      visit edit_case_contact_path(casa_case.reload.case_contacts.last)
-      complete_details_page(contact_made: true)
-      complete_notes_page
-
-      amount_fields = all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']")
-      describe_fields = all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']")
-
-      expect(amount_fields[0].value).to eq("7.21")
-      expect(describe_fields[0].value).to eq("Toll")
-      expect(amount_fields[1].value).to eq("7.22")
-      expect(describe_fields[1].value).to eq("Another Toll")
-      expect(page).to have_text("Add Another Expense")
-
-      find_by_id("add-another-expense").click
-
-      describe_fields[0].fill_in(with: "Breakfast")
-      amount_fields[1].fill_in(with: "7.23")
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']").last.fill_in(with: "8.23")
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']").last.fill_in(with: "Yet another toll")
-
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(0).and change(AdditionalExpense, :count).by(1)
-
-      visit edit_case_contact_path(casa_case.reload.case_contacts.last)
-      complete_details_page(contact_made: true)
-      complete_notes_page
-
-      amount_fields = all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']")
-      describe_fields = all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']")
-
-      expect(amount_fields[2].value).to eq("8.23")
-      expect(describe_fields[2].value).to eq("Yet another toll")
-      expect(describe_fields[0].value).to eq("Breakfast")
-      expect(amount_fields[1].value).to eq("7.23")
-
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 3)
-
-      find_by_id("add-another-expense").click
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 4)
-    end
-
-    it "additional expenses for more than ten entries", js: true do
-      sign_in volunteer
-
-      visit casa_case_path(casa_case.id)
-
-      click_on "New Case Contact"
-
-      complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "Video", occurred_on: "04/04/2020", hours: 1, minutes: 45)
-      complete_notes_page
+  subject do
+    visit new_case_contact_path(casa_case)
+    fill_in_contact_details(contact_types: [contact_type.name])
+    fill_in_mileage want_reimbursement: true, miles: 50, address: "123 Params St"
+  end
 
-      expect(page).to have_text("Add Another Expense")
+  it "is not rendered when casa org expenses disabled" do
+    casa_org.update! additional_expenses_enabled: false
 
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 1)
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']", count: 1)
+    subject
+    check "Request travel or other reimbursement"
 
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']").first.fill_in(with: "0.11")
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']").first.fill_in(with: "1 meal")
+    expect(page).to have_no_field(class: "expense-amount-input", visible: :all)
+    expect(page).to have_no_field(class: "expense-describe-input", visible: :all)
+    expect(page).to have_no_button("Add Another Expense", visible: :all)
+  end
 
-      11.times do |i|
-        find_by_id("add-another-expense").click
-        expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: i + 2)
-        expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']", count: i + 2)
+  it "is not shown until Reimbursement is checked and Add Another Expense clicked" do
+    sign_in volunteer
+    visit new_case_contact_path casa_case
+    fill_in_contact_details
+
+    expect(page).to have_no_button "Add Another Expense"
+    check "Request travel or other reimbursement"
+    expect(page).to have_no_field(class: "expense-amount-input", visible: :all)
+    expect(page).to have_no_field(class: "expense-describe-input", visible: :all)
+    click_on "Add Another Expense"
+    expect(page).to have_field(class: "expense-describe-input")
+    expect(page).to have_field(class: "expense-amount-input")
+  end
 
-        all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']").last.fill_in(with: "#{i + 1}.11")
-        all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']").last.fill_in(with: "#{i + 2} meal")
-      end
+  it "does not submit values if reimbursement is cancelled (unchecked)" do
+    subject
 
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(1).and change(AdditionalExpense, :count).by(12)
-
-      visit edit_case_contact_path(casa_case.reload.case_contacts.last)
-      complete_details_page(contact_made: true)
-      complete_notes_page
+    click_on "Add Another Expense"
+    fill_expense_fields 5.34, "Lunch"
+    uncheck "Request travel or other reimbursement"
 
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 12)
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']", count: 12)
+    expect { click_on "Submit" }
+      .to change(CaseContact.active, :count).by(1)
 
-      amount_fields = all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']")
-      describe_fields = all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']")
+    case_contact = CaseContact.active.last
+    expect(case_contact.additional_expenses).to be_empty
+    expect(case_contact.miles_driven).to be_zero
+    expect(case_contact.want_driving_reimbursement).to be false
+  end
 
-      12.times do |i|
-        expect(amount_fields[i].value).to eq("#{i}.11")
-        expect(describe_fields[i].value).to eq("#{i + 1} meal")
+  it "can remove an expense" do
+    subject
+    fill_in_contact_details
+    check "Request travel or other reimbursement"
+    fill_in "case_contact_miles_driven", with: 50
+    fill_in "case_contact_volunteer_address", with: "123 Params St"
+
+    expect {
+      click_on "Add Another Expense"
+      fill_expense_fields 1.50, "1st meal"
+      click_on "Add Another Expense"
+      fill_expense_fields 2.50, "2nd meal"
+      click_on "Add Another Expense"
+      fill_expense_fields 2.00, "3rd meal"
+
+      within "#contact-form-expenses" do
+        click_on "Delete", match: :first
       end
 
-      expect(page).to have_no_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 13)
-      expect(page).to have_no_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']", count: 13)
-
-      expect(casa_case.case_contacts.last.additional_expenses.count).to eq(12)
-      expect(page).to have_text("Add Another Expense")
-    end
+      expect(page).to have_field(class: "expense-amount-input", count: 2)
 
-    it "additional expenses can be deleted", js: true do
-      sign_in volunteer
-      visit casa_case_path(casa_case.id)
-      click_on "New Case Contact"
+      click_on "Submit"
+    }
+      .to change(CaseContact.active, :count).by(1)
+      .and change(AdditionalExpense, :count).by(2)
 
-      complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "Video", occurred_on: "04/04/2020", hours: 1, minutes: 45)
-      complete_notes_page
-
-      find_by_id("case_contact_additional_expenses_attributes_0_other_expense_amount").fill_in(with: "0.11")
-      find_by_id("case_contact_additional_expenses_attributes_0_other_expenses_describe").fill_in(with: "1 meal")
-
-      expect(page).to have_selector("input[name*='case_contact[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 1)
-
-      find_by_id("add-another-expense").click
+    case_contact = CaseContact.active.last
+    expect(case_contact.additional_expenses.size).to eq(2)
+  end
 
-      expect(page).to have_selector("input[name*='case_contact[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 2)
+  it "requires a description for each additional expense" do
+    subject
 
-      all("input[name*='case_contact[additional_expenses_attributes]'][name$='[other_expense_amount]']").last.fill_in(with: "1.11")
-      all("input[name*='case_contact[additional_expenses_attributes]'][name$='[other_expenses_describe]']").last.fill_in(with: "2 meal")
+    click_on "Add Another Expense"
+    fill_expense_fields 5.34, nil
 
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(1).and change(AdditionalExpense, :count).by(2)
+    expect { click_on "Submit" }
+      .to not_change(CaseContact.active, :count)
+      .and not_change(AdditionalExpense, :count)
 
-      visit edit_case_contact_path(casa_case.reload.case_contacts.last)
-      complete_details_page(contact_made: true)
-      complete_notes_page
-
-      all("button.remove-expense-button").last.click
-
-      expect(page).to have_selector("input[name*='case_contact[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 1)
-      expect(page).to have_selector("input[name*='case_contact[additional_expenses_attributes]'][name$='[other_expenses_describe]']", count: 1)
+    expect(page).to have_text("Other Expense Details can't be blank")
+  end
 
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(0).and change(AdditionalExpense, :count).by(-1)
+  context "when editing existing case contact expenses" do
+    let(:case_contact) { create :case_contact, :wants_reimbursement, casa_case:, creator: volunteer, contact_types: [contact_type] }
+    let!(:additional_expenses) do
+      [
+        create(:additional_expense, case_contact:, other_expense_amount: 1.11, other_expenses_describe: "First Expense"),
+        create(:additional_expense, case_contact:, other_expense_amount: 2.22, other_expenses_describe: "Second Expense")
+      ]
     end
 
-    it "verifies that an additional expense without a description will cause an error", js: true do
-      sign_in volunteer
+    subject { visit edit_case_contact_path case_contact }
 
-      visit casa_case_path(casa_case.id)
+    it "shows existing expenses in the form" do
+      subject
 
-      click_on "New Case Contact"
+      expect(page).to have_field(class: "expense-amount-input", count: additional_expenses.size)
+      expect(page).to have_field(class: "expense-describe-input", count: additional_expenses.size)
+      expect(page).to have_field(class: "expense-amount-input", with: "1.11")
+      expect(page).to have_field(class: "expense-describe-input", with: "First Expense")
+      expect(page).to have_field(class: "expense-amount-input", with: "2.22")
+      expect(page).to have_field(class: "expense-describe-input", with: "Second Expense")
+      expect(page).to have_button "Add Another Expense"
+    end
 
-      complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "Video", occurred_on: "04/04/2020", hours: 1, minutes: 45)
-      complete_notes_page
-      expect(page).to have_text("Add Another Expense")
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']", count: 1)
-      expect(page).to have_selector("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']", count: 1)
+    it "allows removing expenses" do
+      subject
 
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']").first.fill_in(with: "5.34")
+      expect(page).to have_css(".expense-amount-input", count: 2)
+      expect(page).to have_css(".expense-describe-input", count: 2)
 
       expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(0).and change(AdditionalExpense, :count).by(0)
-
-      expect(page).to have_text("error")
+        within "#contact-form-expenses" do
+          click_on "Delete", match: :first
+        end
 
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']").first.fill_in(with: "1 meal")
+        expect(page).to have_css(".expense-amount-input", count: 1)
+        expect(page).to have_css(".expense-describe-input", count: 1)
 
-      expect {
         click_on "Submit"
-      }.to change(CaseContact.active, :count).by(1).and change(AdditionalExpense, :count).by(1)
-      expect(page).not_to have_text("error")
-
-      visit edit_case_contact_path(casa_case.reload.case_contacts.last)
-      complete_details_page(contact_made: true)
-      complete_notes_page
+      }
+        .to not_change(CaseContact.active, :count)
+        .and change(AdditionalExpense, :count).by(-1)
 
-      find_by_id("add-another-expense").click
-
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expense_amount]']").last.fill_in(with: "7.45")
-
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(0).and change(AdditionalExpense, :count).by(0)
-      expect(page).to have_text("error")
+      expect(case_contact.reload.additional_expenses.size).to eq(1)
+    end
 
-      all("input[name*='[additional_expenses_attributes]'][name$='[other_expenses_describe]']").last.fill_in(with: "2nd meal")
+    it "can add an expense" do
+      subject
 
       expect {
+        click_on "Add Another Expense"
+        fill_expense_fields 11.50, "Gas"
         click_on "Submit"
-      }.to change(CaseContact.active, :count).by(0).and change(AdditionalExpense, :count).by(1)
-      expect(page).not_to have_text("error")
+      }
+        .to change(AdditionalExpense, :count).by(1)
+      expect(case_contact.reload.additional_expenses.size).to eq(3)
     end
   end
 end
diff --git a/spec/system/case_contacts/contact_topic_answers_spec.rb b/spec/system/case_contacts/contact_topic_answers_spec.rb
new file mode 100644
index 0000000000..6dfc0dea08
--- /dev/null
+++ b/spec/system/case_contacts/contact_topic_answers_spec.rb
@@ -0,0 +1,237 @@
+require "rails_helper"
+
+RSpec.describe "CaseContact form ContactTopicAnswers and notes", :js, type: :system do
+  let(:casa_org) { create :casa_org, :all_reimbursements_enabled }
+  let(:casa_case) { volunteer.casa_cases.first }
+  let(:volunteer) { create :volunteer, :with_single_case, casa_org: }
+  let(:user) { volunteer }
+
+  let!(:contact_type) { create :contact_type, casa_org: }
+  let(:topic_count) { 2 }
+  let!(:contact_topics) { create_list :contact_topic, topic_count, casa_org: }
+  let(:contact_topic_questions) { contact_topics.map(&:question) }
+  let(:select_options) { contact_topic_questions + ["Select a discussion topic"] }
+
+  let(:topic_select_class) { "contact-topic-id-select" }
+  let(:topic_answer_input_class) { "contact-topic-answer-input" }
+
+  let(:autosave_alert_div) { "#contact-form-notes" }
+  let(:autosave_alert_css) { 'small[role="alert"]' }
+  let(:autosave_alert_text) { "Saved!" }
+
+  subject do
+    sign_in user
+    visit new_case_contact_path(casa_case)
+  end
+
+  def notes_section
+    page.find_by_id("contact-form-notes")
+  end
+
+  it "shows a topic form when page is loaded and lists all contact topics" do
+    subject
+
+    expect(notes_section).to have_field(class: topic_select_class)
+    expect(notes_section).to have_field(class: topic_answer_input_class)
+    expect(notes_section).to have_select(class: topic_select_class, with_options: contact_topic_questions)
+  end
+
+  it "adds contact answers for the topics" do
+    subject
+    fill_in_contact_details(contact_types: [contact_type.name])
+
+    topic_one = contact_topics.first
+    topic_two = contact_topics.last
+
+    fill_in_notes(contact_topic_answers_attrs: [
+      {question: topic_one.question, answer: "First discussion topic answer."},
+      {question: topic_two.question, answer: "Second discussion topic answer."}
+    ])
+
+    expect { click_on "Submit" }
+      .to change(CaseContact.active, :count).by(1)
+
+    case_contact = CaseContact.active.last
+    expect(case_contact.reload.contact_topic_answers).to be_present
+    expect(case_contact.reload.contact_topic_answers.size).to eq 2
+    first_topic_answer = case_contact.contact_topic_answers.find_by(contact_topic_id: topic_one.id)
+    second_topic_answer = case_contact.contact_topic_answers.find_by(contact_topic_id: topic_two.id)
+    expect(first_topic_answer.value).to eq "First discussion topic answer."
+    expect(second_topic_answer.value).to eq "Second discussion topic answer."
+  end
+
+  it "does not add multiple records for the same answer due to autosave", :js do
+    subject
+    fill_in_contact_details(contact_types: [contact_type.name])
+
+    expect {
+      using_wait_time 6 do # autosave debounce may be longer than capybara's wait time
+        answer_topic contact_topics.first.question, "First discussion topic answer."
+        within notes_section do
+          expect(page).to have_text "Saved"  # autosave success alert
+          expect(page).to have_no_text "Saved" # wait for clearing of alert
+        end
+        answer_topic contact_topics.first.question, "Changing the first topic answer."
+        within notes_section { expect(page).to have_text "Saved" }
+      end
+
+      click_on "Submit"
+    }
+      .to change(CaseContact.active, :count).by(1)
+      .and change(ContactTopicAnswer, :count).by(0) # answer already exists on page load
+
+    case_contact = CaseContact.active.last
+    created_answer = ContactTopicAnswer.last
+    expect(created_answer.contact_topic).to eq(contact_topics.first)
+    expect(created_answer.value).to eq "Changing the first topic answer."
+    expect(case_contact.contact_topic_answers.size).to eq 1
+    expect(case_contact.contact_topic_answers).to include created_answer
+  end
+
+  it "prevents adding more answers than topics" do
+    subject
+
+    (contact_topics.size - 1).times do
+      click_on "Add Another Discussion Topic"
+    end
+
+    expect(notes_section).to have_button("Add Another Discussion Topic", disabled: true)
+  end
+
+  it "disables contact topics that are already selected" do
+    subject
+
+    topic_one_question = contact_topics.first.question
+    answer_topic topic_one_question, "First discussion topic answer."
+
+    expect(notes_section).to have_select(class: topic_select_class, count: 1)
+    expect(notes_section).to have_no_select(class: topic_select_class, disabled_options: [topic_one_question])
+    click_on "Add Another Discussion Topic"
+    expect(notes_section).to have_select(class: topic_select_class, count: 2)
+    expect(notes_section).to have_select(class: topic_select_class, disabled_options: [topic_one_question], count: 1)
+  end
+
+  context "when casa org has no contact topics" do
+    let(:contact_topics) { [] }
+
+    it "displays a field for contact.notes" do
+      subject
+      expect(page).to have_no_button "Add Another Discussion Topic"
+      expect(notes_section).to have_field "Additional Notes"
+
+      fill_in_contact_details
+      fill_in "Additional Notes", with: "This is a note."
+
+      expect { click_on "Submit" }.to change(CaseContact.active, :count).by(1)
+
+      contact = CaseContact.active.last
+      expect(contact.contact_topic_answers).to be_empty
+      expect(contact.notes).to eq "This is a note."
+    end
+
+    it "saves 'Additional Notes' answer as contact.notes" do
+      subject
+      fill_in_contact_details(contact_types: [contact_type.name])
+
+      fill_in "Additional Notes", with: "This is a fake a topic answer."
+
+      expect { click_on "Submit" }.to change(CaseContact.active, :count).by(1)
+
+      contact = CaseContact.active.last
+      expect(contact.contact_topic_answers).to be_empty
+      expect(contact.notes).to eq "This is a fake a topic answer."
+    end
+  end
+
+  context "when editing existing an case contact" do
+    let(:case_contact) { create :case_contact, casa_case:, creator: user }
+
+    subject do
+      sign_in user
+      visit edit_case_contact_path(case_contact)
+    end
+
+    context "when there are existing contact topic answers" do
+      let(:topic_one) { contact_topics.first }
+      let!(:answer_one) { create :contact_topic_answer, contact_topic: topic_one, case_contact: }
+      let(:topic_two) { contact_topics.second }
+      let!(:answer_two) { create :contact_topic_answer, contact_topic: topic_two, case_contact: }
+
+      it "fills inputs with the answers" do
+        subject
+
+        expect(notes_section).to have_select(class: topic_select_class, count: 2)
+        expect(notes_section).to have_field(class: topic_answer_input_class, count: 2)
+
+        expect(notes_section).to have_field(class: topic_answer_input_class, with: answer_one.value)
+        expect(notes_section).to have_field(class: topic_answer_input_class, with: answer_two.value)
+
+        expect(notes_section).to have_select(
+          class: topic_select_class, selected: topic_one.question, options: select_options
+        )
+        expect(notes_section).to have_select(
+          class: topic_select_class, selected: topic_two.question, options: select_options
+        )
+      end
+
+      it "can remove an existing answer" do
+        subject
+        fill_in_contact_details
+
+        expect(notes_section).to have_select(class: topic_select_class, count: 2)
+
+        expect {
+          accept_confirm do
+            notes_section.find_button(text: "Delete", match: :first).click
+          end
+
+          expect(notes_section).to have_select(class: topic_select_class, count: 1, visible: :all)
+
+          click_on "Submit"
+        }
+          .to change(ContactTopicAnswer, :count).by(-1)
+
+        case_contact.reload
+        expect(case_contact.contact_topic_answers.size).to eq(1)
+      end
+    end
+
+    it "autosaves form with answer inputs" do
+      expect { subject }.to change(CaseContact, :count).by(1)
+      case_contact = CaseContact.last
+      expect(case_contact.casa_case).to eq casa_case
+      fill_in_contact_details(
+        contact_made: false, medium: "In Person", occurred_on: 1.day.ago.to_date, hours: 1, minutes: 5
+      )
+
+      expect {
+        click_on "Add Another Discussion Topic"
+        answer_topic contact_topics.first.question, "Topic One answer."
+        within autosave_alert_div do
+          find(autosave_alert_css, text: autosave_alert_text, wait: 3)
+        end
+      }
+        .to change(ContactTopicAnswer, :count).by(1)
+      case_contact.reload
+      expect(case_contact.contact_topic_answers.size).to eq(1)
+      expect(case_contact.contact_topic_answers.last.value).to eq "Topic One answer."
+
+      expect(case_contact.contact_made).to be false
+      expect(case_contact.medium_type).to eq "in-person"
+      expect(case_contact.duration_minutes).to eq 65
+      expect(case_contact.occurred_at).to eq 1.day.ago.to_date
+    end
+
+    context "when contact notes exist" do
+      let(:notes) { "This was previously saved as 'case_contact.notes'." }
+
+      before { case_contact.update! notes: }
+
+      it "presents an 'Additional Notes' field" do
+        subject
+
+        expect(notes_section).to have_field("Additional Notes", with: case_contact.notes)
+      end
+    end
+  end
+end
diff --git a/spec/system/case_contacts/create_spec.rb b/spec/system/case_contacts/create_spec.rb
deleted file mode 100644
index 31d4eb1936..0000000000
--- a/spec/system/case_contacts/create_spec.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "case_contacts/create", type: :system, js: true do
-  let(:contact_topics) { [build(:contact_topic, question: "q1"), build(:contact_topic, question: "q2")] }
-  let(:org) { create(:casa_org, contact_topics: contact_topics) }
-  let(:volunteer) { create(:volunteer, :with_cases_and_contacts, :with_assigned_supervisor, casa_org: org) }
-  let(:casa_case) { volunteer.casa_cases.first }
-
-  context "redirects to where new case contact started from" do
-    before do
-      sign_in volunteer
-    end
-
-    it "when /case_contacts" do
-      visit case_contacts_path
-
-      click_on "New Case Contact"
-      complete_details_page(case_numbers: [casa_case.case_number], medium: "In Person", contact_made: true, hours: 1, minutes: 45)
-      complete_notes_page
-      fill_in_expenses_page
-      click_on "Submit"
-
-      expect(page).to have_text "Case contact successfully created"
-    end
-
-    it "when /case_contacts?casa_case_id=ID" do
-      visit case_contacts_path(casa_case_id: casa_case.id)
-
-      click_on "New Case Contact"
-      complete_details_page(case_numbers: [casa_case.case_number], medium: "In Person", contact_made: true, hours: 1, minutes: 45)
-      complete_notes_page
-      fill_in_expenses_page
-      click_on "Submit"
-
-      expect(page).to have_text "Case contact successfully created"
-    end
-
-    it "when /casa_cases/CASE_NUMBER" do
-      visit casa_case_path(casa_case)
-
-      click_on "New Case Contact"
-      complete_details_page(case_numbers: [casa_case.case_number], medium: "In Person", contact_made: true, hours: 1, minutes: 45)
-      complete_notes_page
-      fill_in_expenses_page
-      click_on "Submit"
-
-      expect(page).to have_text "Case contact successfully created"
-    end
-  end
-
-  describe "notes page", js: true do
-    before(:each) do
-      sign_in volunteer
-      visit case_contacts_path
-      click_on "New Case Contact"
-
-      complete_details_page(
-        case_numbers: [casa_case.case_number],
-        medium: "In Person",
-        contact_made: true,
-        hours: 1,
-        minutes: 45,
-        contact_topics: [contact_topics.first.question]
-      )
-    end
-
-    it "has selected topics expanded but no details expanded" do
-      topic_one_id = contact_topics.first.question.parameterize.underscore
-      topic_two_id = contact_topics.last.question.parameterize.underscore
-
-      expect(page).to have_text contact_topics.first.question
-      expect(page).to_not have_text contact_topics.first.details
-
-      within("##{topic_one_id}") do
-        expect(page).to have_text("read more")
-        expect(page).to have_selector("##{topic_one_id} textarea")
-      end
-
-      expect(page).to have_text contact_topics.last.question
-      expect(page).to_not have_text contact_topics.last.details
-      expect(page).to_not have_selector("##{topic_two_id}")
-    end
-
-    it "expands to show and hide the text field and details", js: true do
-      click_on "read more"
-      topic_id = contact_topics.first.question.parameterize.underscore
-
-      expect(page).to have_text(contact_topics.first.question)
-      expect(page).to have_text(contact_topics.first.details)
-      expect(page).to have_selector("##{topic_id} textarea")
-
-      find("##{topic_id}_button").click
-
-      expect(page).to have_text(contact_topics.first.question)
-      expect(page).to_not have_text(contact_topics.first.details)
-      expect(page).to_not have_selector("##{topic_id} textarea")
-
-      find("##{topic_id}_button").click
-
-      expect(page).to have_text(contact_topics.first.question)
-      expect(page).to have_text(contact_topics.first.details)
-      expect(page).to have_selector("##{topic_id} textarea")
-    end
-
-    it "expands to show/hide details", js: true do
-      topic_id = contact_topics.first.question.parameterize.underscore
-
-      expect(page).to have_text(contact_topics.first.question)
-
-      within("##{topic_id}") do
-        expect(page).to_not have_text(contact_topics.first.details)
-        expect(page).to have_selector("##{topic_id} textarea")
-
-        click_on "read more"
-
-        expect(page).to have_text(contact_topics.first.details)
-        expect(page).to have_selector("##{topic_id} textarea")
-
-        click_on "read less"
-
-        expect(page).to_not have_text(contact_topics.first.details)
-        expect(page).to have_selector("##{topic_id} textarea")
-      end
-    end
-  end
-
-  context "when the org has neither reimbursable expenses nor travel" do
-    before do
-      allow(Flipper).to receive(:enabled?).with(:show_additional_expenses).and_return(false)
-      allow_any_instance_of(CasaOrg).to receive(:show_driving_reimbursement).and_return(false)
-      sign_in volunteer
-    end
-
-    it "should skip expenses step and create a case contact" do
-      visit case_contacts_path
-
-      click_on "New Case Contact"
-      complete_details_page(case_numbers: [casa_case.case_number], medium: "In Person", contact_made: true, hours: 1, minutes: 45)
-      complete_notes_page(click_continue: false)
-      expect(page).to have_text("Step 2 of 2")
-      click_on "Submit"
-
-      expect(page).to have_text "Case contact successfully created"
-    end
-  end
-end
diff --git a/spec/system/case_contacts/edit_spec.rb b/spec/system/case_contacts/edit_spec.rb
index caae4d8ad0..18f57f1117 100644
--- a/spec/system/case_contacts/edit_spec.rb
+++ b/spec/system/case_contacts/edit_spec.rb
@@ -1,16 +1,24 @@
 require "rails_helper"
 
-RSpec.describe "case_contacts/edit", type: :system do
-  let(:organization) { build(:casa_org) }
-  let(:casa_case) { create(:casa_case, :with_case_assignments, casa_org: organization) }
-  let!(:case_contact) { create(:case_contact, duration_minutes: 105, casa_case: casa_case) }
+RSpec.describe "case_contacts/edit", :js, type: :system do
+  let(:organization) { build(:casa_org, :all_reimbursements_enabled) }
+  let(:volunteer) { create(:volunteer, :with_single_case, casa_org: organization) }
+  let(:casa_case) { volunteer.casa_cases.first }
+  let(:contact_types) { create_list(:contact_type, 2, casa_org: organization) }
+  let(:case_contact) do
+    create(:case_contact, duration_minutes: 105, casa_case:, creator: volunteer, contact_types: [contact_types.first])
+  end
+
+  let(:user) { volunteer }
+
+  before { sign_in user }
 
   context "when admin" do
     let(:admin) { create(:casa_admin, casa_org: organization) }
 
-    it "admin successfully edits case contact", js: true do
-      sign_in admin
+    let(:user) { admin }
 
+    it "admin successfully edits case contact" do
       visit edit_case_contact_path(case_contact)
 
       complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "Letter")
@@ -24,14 +32,10 @@
       expect(case_contact.casa_case_id).to eq casa_case.id
       expect(case_contact.duration_minutes).to eq 105
       expect(case_contact.medium_type).to eq "letter"
-      expect(case_contact.contact_made).to eq true
+      expect(case_contact.contact_made).to be true
     end
 
-    it "admin successfully edits case contact with mileage reimbursement", js: true do
-      casa_case = create(:casa_case, :with_one_case_assignment, casa_org: organization)
-      case_contact = create(:case_contact, duration_minutes: 105, casa_case: casa_case)
-      sign_in admin
-
+    it "admin successfully edits case contact with mileage reimbursement" do
       visit edit_case_contact_path(case_contact)
 
       complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "In Person", hours: 1, minutes: 45, occurred_on: "04/04/2020")
@@ -41,116 +45,138 @@
       click_on "Submit"
       case_contact.reload
       expect(page).to have_text "Case contact created at #{case_contact.created_at.strftime("%-I:%-M %p on %m-%e-%Y")}, was successfully updated."
-      expect(case_contact.casa_case.volunteers[0].address.content).to eq "123 str"
+      expect(case_contact.casa_case.volunteers[0]).to eq volunteer
+      expect(volunteer.address&.content).to eq "123 str"
       expect(case_contact.casa_case_id).to eq casa_case.id
       expect(case_contact.duration_minutes).to eq 105
       expect(case_contact.medium_type).to eq "in-person"
-      expect(case_contact.contact_made).to eq true
+      expect(case_contact.contact_made).to be true
     end
 
-    it "admin fails to edit volunteer address for case contact with mileage reimbursement", js: true do
-      sign_in admin
+    it "does not allow volunteer address edit for case contact with ambiguous volunteer" do
+      create(:case_assignment, casa_case:, volunteer: create(:volunteer, casa_org: organization))
+      case_contact.update!(creator: admin)
+      expect(casa_case.volunteers).not_to include case_contact.creator
+      expect(casa_case.volunteers.size).to be > 1
 
       visit edit_case_contact_path(case_contact)
 
       complete_details_page(case_numbers: [], contact_types: [], contact_made: true, medium: "In Person", hours: 1, minutes: 45, occurred_on: "04/04/2020")
       complete_notes_page
 
-      expect(find("#case_contact_volunteer_address").value)
-        .to eq("There are two or more volunteers assigned to this case and \
-you are trying to set the address for both of them. This is not currently possible.")
+      check "Request travel or other reimbursement"
+      expect(page).to have_field("case_contact_volunteer_address", disabled: true)
+      expect(page).to have_text("There are two or more volunteers assigned to this case and you are trying to set the address for both of them. This is not currently possible.")
+
+      click_on "Submit"
+      expect(case_contact.reload.volunteer_address).to be_blank
     end
 
-    context "is part of a different organization" do
+    context "when user is part of a different organization" do
       let(:other_organization) { build(:casa_org) }
       let(:admin) { create(:casa_admin, casa_org: other_organization) }
 
-      it "fails across organizations" do
-        sign_in admin
-
+      it "fails across organizations", js: false do
         visit edit_case_contact_path(case_contact)
-        expect(current_path).to eq supervisors_path
+        expect(page).to have_current_path supervisors_path, ignore_query: true
       end
     end
   end
 
-  context "volunteer user" do
-    let(:volunteer) { create(:volunteer, casa_org: organization) }
-    let!(:case_assignment) { create(:case_assignment, volunteer: volunteer, casa_case: casa_case) }
-
-    it "is successful", js: true do
-      case_contact = create(:case_contact, duration_minutes: 105, casa_case: casa_case, creator: volunteer)
-      sign_in volunteer
-      visit edit_case_contact_path(case_contact)
-
-      complete_details_page(contact_made: true, medium: "Letter")
-      complete_notes_page
-      fill_in_expenses_page
-
-      click_on "Submit"
-
-      case_contact.reload
-      expect(page).to have_text "Case contact created at #{case_contact.created_at.strftime("%-I:%-M %p on %m-%e-%Y")}, was successfully updated."
-      expect(case_contact.casa_case_id).to eq casa_case.id
-      expect(case_contact.duration_minutes).to eq 105
-      expect(case_contact.medium_type).to eq "letter"
-      expect(case_contact.contact_made).to eq true
-    end
+  it "can update case contact attributes" do
+    expect(case_contact.active?).to be true
+    expect(case_contact.contact_types).to contain_exactly(contact_types.first)
+    expect(case_contact.contact_made).to be false
+    expect(case_contact.medium_type).to eq "in-person"
+    expect(case_contact.duration_minutes).to eq 105
+    expect(case_contact.volunteer_address).to be_blank
+    expect(case_contact.notes).to be_blank
+    expect(case_contact.contact_topic_answers).to be_empty
+    expect(case_contact.miles_driven).to be_zero
+    expect(case_contact.want_driving_reimbursement).to be false
+    expect(case_contact.additional_expenses).to be_empty
+
+    contact_topic = create(:contact_topic, casa_org: organization)
+
+    visit edit_case_contact_path(case_contact)
+
+    uncheck contact_types.first.name
+    complete_details_page(
+      case_numbers: [], contact_made: true, medium: "Letter", contact_types: [contact_types.second.name],
+      occurred_on: Time.zone.today - 5.days, hours: 1, minutes: 5
+    )
+    click_on "Add Another Discussion Topic"
+    answer_topic contact_topic.question, "Topic 1 Answer."
+    fill_in_expenses_page(miles: 50, want_reimbursement: true, address: "123 Form St")
+    click_on "Submit"
+
+    case_contact.reload
+    expect(page).to have_text "Case contact created at #{case_contact.created_at.strftime("%-I:%-M %p on %m-%e-%Y")}, was successfully updated."
+    expect(case_contact.duration_minutes).to eq 65
+    expect(case_contact.medium_type).to eq "letter"
+    expect(case_contact.contact_made).to be true
+    expect(case_contact.contact_types).to contain_exactly(contact_types.second)
+    # notes
+    expect(case_contact.contact_topic_answers).to be_present
+    expect(case_contact.contact_topic_answers.first.contact_topic).to eq contact_topic
+    expect(case_contact.contact_topic_answers.first.value).to eq "Topic 1 Answer."
+    # reimbursement
+    expect(case_contact.miles_driven).to eq 50
+    expect(case_contact.want_driving_reimbursement).to be true
+    expect(case_contact.volunteer_address).to eq "123 Form St"
+  end
 
-    it "is successful with mileage reimbursement on", js: true do
-      case_contact = create(:case_contact, duration_minutes: 105, casa_case: casa_case, creator: volunteer)
-      sign_in volunteer
-      visit edit_case_contact_path(case_contact)
+  it "is successful with mileage reimbursement on" do
+    visit edit_case_contact_path(case_contact)
 
-      complete_details_page(contact_made: true, medium: "In Person", hours: 1, minutes: 45, occurred_on: "04/04/2020")
-      complete_notes_page
-      fill_in_expenses_page(miles: 10, want_reimbursement: true, address: "123 str")
+    complete_details_page(contact_made: true, medium: "In Person", hours: 1, minutes: 45, occurred_on: "04/04/2020")
+    complete_notes_page
+    fill_in_expenses_page(miles: 10, want_reimbursement: true, address: "123 str")
 
-      click_on "Submit"
+    click_on "Submit"
 
-      case_contact.reload
-      volunteer.reload
-      expect(page).to have_text "Case contact created at #{case_contact.created_at.strftime("%-I:%-M %p on %m-%e-%Y")}, was successfully updated."
-      expect(volunteer.address.content).to eq "123 str"
-      expect(case_contact.casa_case_id).to eq casa_case.id
-      expect(case_contact.duration_minutes).to eq 105
-      expect(case_contact.medium_type).to eq "in-person"
-      expect(case_contact.contact_made).to eq true
-    end
+    case_contact.reload
+    volunteer.reload
+    expect(page).to have_text "Case contact created at #{case_contact.created_at.strftime("%-I:%-M %p on %m-%e-%Y")}, was successfully updated."
+    expect(volunteer.address.content).to eq "123 str"
+    expect(case_contact.casa_case_id).to eq casa_case.id
+    expect(case_contact.duration_minutes).to eq 105
+    expect(case_contact.medium_type).to eq "in-person"
+    expect(case_contact.contact_made).to be true
+  end
 
-    it "autosaves notes", js: true do
-      case_contact = create(:case_contact, duration_minutes: 105, casa_case: casa_case, creator: volunteer, notes: "Hello from the other side")
-      sign_in volunteer
-      visit edit_case_contact_path(case_contact)
+  it "autosaves notes" do
+    autosave_alert_div = "#contact-form-notes"
+    autosave_alert_css = 'small[role="alert"]'
+    autosave_alert_text = "Saved!"
+    autosave_wait_time = 4
 
-      complete_details_page(contact_made: true)
-      expect(CaseContact.last.notes).not_to eq "Hello world"
+    case_contact = create(:case_contact, duration_minutes: 105, casa_case: casa_case, creator: volunteer, notes: "Hello from the other side")
+    visit edit_case_contact_path(case_contact)
 
-      complete_notes_page(notes: "Hello world", click_continue: false)
+    complete_details_page(contact_made: true)
+    expect(case_contact.reload.notes).to eq "Hello from the other side"
 
-      within 'div[data-controller="autosave"]' do
-        find('small[data-autosave-target="alert"]', text: "Saved!")
-      end
+    fill_in "Additional Notes", with: "Hello world"
 
-      expect(CaseContact.last.notes).to eq "Hello world"
+    within autosave_alert_div do
+      find(autosave_alert_css, text: autosave_alert_text, wait: autosave_wait_time)
     end
+    expect(case_contact.reload.notes).to eq "Hello world"
+  end
 
-    context "when 'Create Another' option is checked" do
-      it "redirects to new contact with the same draft_case_ids", js: true do
-        case_contact = create(:case_contact, duration_minutes: 105, casa_case: casa_case, creator: volunteer)
-        sign_in volunteer
-        visit edit_case_contact_path(case_contact)
-
-        complete_details_page(contact_made: true, medium: "Letter")
-        complete_notes_page
-        fill_in_expenses_page
+  context "when 'Create Another' option is checked" do
+    it "creates a duplicate case contact for the second contact" do
+      case_contact_draft_ids = case_contact.draft_case_ids
+      visit edit_case_contact_path(case_contact)
 
-        check "Create Another"
-        expect { click_on "Submit" }.to change { CaseContact.count }.by(1)
+      check "Create Another"
 
-        expect(page).to have_text "Step 1 of 3"
-        expect(page).to have_text casa_case.case_number
-      end
+      expect { click_on "Submit" }.to change(CaseContact.started, :count).by(1)
+      new_case_contact = CaseContact.last
+      expect(new_case_contact.draft_case_ids).to match_array(case_contact_draft_ids)
+      expect(page).to have_text "New Case Contact"
+      expect(page).to have_text casa_case.case_number
     end
   end
 end
diff --git a/spec/system/case_contacts/index_spec.rb b/spec/system/case_contacts/index_spec.rb
index 644f2ee3c6..dccdfde086 100644
--- a/spec/system/case_contacts/index_spec.rb
+++ b/spec/system/case_contacts/index_spec.rb
@@ -1,9 +1,13 @@
 require "rails_helper"
 
-RSpec.describe "case_contacts/index", js: true, type: :system do
+RSpec.describe "case_contacts/index", :js, type: :system do
   let(:volunteer) { build(:volunteer, display_name: "Bob Loblaw", casa_org: organization) }
   let(:organization) { create(:casa_org) }
 
+  before { sign_in volunteer }
+
+  subject { visit case_contacts_path }
+
   context "with case contacts" do
     let(:case_number) { "CINA-1" }
     let(:casa_case) { build(:casa_case, casa_org: organization, case_number: case_number) }
@@ -23,8 +27,8 @@
 
       it "can see case creator in card" do
         case_contacts
-        sign_in volunteer
-        visit case_contacts_path
+        subject
+
         within(".full-card", match: :first) do
           expect(page).to have_text("Bob Loblaw")
         end
@@ -32,31 +36,30 @@
 
       it "can navigate to edit volunteer page" do
         case_contacts
-        sign_in volunteer
-        visit case_contacts_path
+        subject
+
         expect(page).to have_no_link("Bob Loblaw")
       end
 
       it "allows the volunteer to delete a draft they created" do
         case_contacts
-        sign_in volunteer
-        visit case_contacts_path
+        subject
 
         card = find(".container-fluid.mb-1", text: "DRAFT Case Contact")
-        expect(card).to_not be_nil
+        expect(card).not_to be_nil
 
         within_element(card) do
           expect(card).to have_text("Draft")
-          click_link "Delete"
+          click_on "Delete"
         end
 
-        expect(page).to_not have_css(".container-fluid.mb-1", text: "DRAFT Case Contact")
+        expect(page).to have_no_css(".container-fluid.mb-1", text: "DRAFT Case Contact")
       end
 
       it "displays the contact type groups" do
         case_contacts
-        sign_in volunteer
-        visit case_contacts_path
+        subject
+
         expect(page).to have_text("Most Recent Case Contact")
         expect(page).to have_text("DRAFT Case Contact")
       end
@@ -65,24 +68,31 @@
     describe "filtering case contacts" do
       describe "by date of contact" do
         it "only shows the contacts with the correct date" do
-          travel_to Date.new(2021, 1, 2) do
-            create(:case_contact, creator: volunteer, casa_case: casa_case, occurred_at: Time.zone.yesterday - 1)
-            create(:case_contact, creator: volunteer, casa_case: casa_case, occurred_at: Time.zone.yesterday)
-            create(:case_contact, creator: volunteer, casa_case: casa_case, occurred_at: Time.zone.today)
-
-            sign_in volunteer
-            visit case_contacts_path
-            click_button "Expand / Hide"
-
-            fill_in "filterrific_occurred_starting_at", with: Time.zone.yesterday
-            fill_in "filterrific_occurred_ending_at", with: Time.zone.tomorrow
-
-            click_button "Filter"
-
-            expect(page).not_to have_content "December 31, 2020"
-            expect(page).to have_content "January 1, 2021"
-            expect(page).to have_content "January 2, 2021"
-          end
+          yesterday = Time.zone.yesterday
+          day_before_yesterday = yesterday - 1.day
+          today = Time.zone.today
+          create(:case_contact, creator: volunteer, casa_case: casa_case, occurred_at: day_before_yesterday)
+          create(:case_contact, creator: volunteer, casa_case: casa_case, occurred_at: yesterday)
+          create(:case_contact, creator: volunteer, casa_case: casa_case, occurred_at: today)
+          subject
+
+          click_on "Expand / Hide"
+
+          yesterday_display = I18n.l(yesterday, format: :full, default: nil)
+          day_before_yesterday_display = I18n.l(day_before_yesterday, format: :full, default: nil)
+          today_display = I18n.l(today, format: :full, default: nil)
+          expect(page).to have_content day_before_yesterday_display
+          expect(page).to have_content yesterday_display
+          expect(page).to have_content today_display
+
+          fill_in "filterrific_occurred_starting_at", with: yesterday
+          fill_in "filterrific_occurred_ending_at", with: Time.zone.tomorrow
+
+          click_on "Filter"
+
+          expect(page).to have_no_content day_before_yesterday_display
+          expect(page).to have_content yesterday_display
+          expect(page).to have_content today_display
         end
       end
 
@@ -90,19 +100,19 @@
         let!(:case_contact) { create(:case_contact, :details_status, creator: volunteer, draft_case_ids: [casa_case.id]) }
         let!(:other_casa_case) { create(:casa_case, casa_org: organization, case_number: "CINA-2") }
 
+        subject { visit case_contacts_path(casa_case_id: casa_case.id) }
+
         it "displays the draft" do
-          sign_in volunteer
-          visit case_contacts_path(casa_case_id: casa_case.id)
+          subject
 
-          expect(page).not_to have_content "You have no case contacts for this case."
+          expect(page).to have_no_content "You have no case contacts for this case."
           expect(page).to have_content "Draft"
         end
 
         it "only displays the filtered case" do
-          sign_in volunteer
-          visit case_contacts_path(casa_case_id: casa_case.id)
+          subject
 
-          expect(page).not_to have_content other_casa_case.case_number
+          expect(page).to have_no_content other_casa_case.case_number
           expect(page).to have_content casa_case.case_number
         end
       end
@@ -111,22 +121,19 @@
         it "does not show draft contacts" do
           create(:case_contact, creator: volunteer, casa_case: casa_case)
           create(:case_contact, :started_status, creator: volunteer, casa_case: casa_case)
-
-          sign_in volunteer
-          visit case_contacts_path
+          subject
 
           check "Hide drafts"
 
-          click_button "Filter"
+          click_on "Filter"
 
-          expect(page).not_to have_content "Draft"
+          expect(page).to have_no_content "Draft"
         end
       end
 
       describe "collapsing filter menu" do
         before do
-          sign_in volunteer
-          visit case_contacts_path
+          subject
         end
 
         it "displays sticky filters before clicking expand" do
@@ -136,23 +143,23 @@
         it "does not expand menu when filtering only by sticky filter" do
           check "Hide drafts"
 
-          click_button "Filter"
+          click_on "Filter"
 
           expect(page).to have_field "Hide drafts", type: :checkbox
-          expect(page).not_to have_content "Other filters"
+          expect(page).to have_no_content "Other filters"
         end
 
         it "displays other filters when expanded" do
-          click_button "Expand / Hide"
+          click_on "Expand / Hide"
 
           expect(page).to have_content "Other filters"
         end
 
         it "does not hide menu when filtering by placement filter" do
-          click_button "Expand / Hide"
+          click_on "Expand / Hide"
           select "In Person", from: "Contact medium"
 
-          click_button "Filter"
+          click_on "Filter"
 
           expect(page).to have_content "Other filters"
         end
@@ -165,12 +172,9 @@
       context "with active case contact" do
         let!(:case_contact) { create(:case_contact, creator: volunteer, casa_case: casa_case, occurred_at: Time.zone.yesterday) }
 
-        before do
-          sign_in volunteer
-          visit case_contacts_path
-        end
-
         it "displays correct color for contact" do
+          subject
+
           within ".card-title" do
             title = find("strong.text-primary")
             expect(title).to have_content(contact_group_text)
@@ -180,69 +184,98 @@
     end
 
     it "can show only case contacts for one case" do
-      travel_to Date.new(2021, 1, 2) do
-        create(:case_contact, creator: volunteer, casa_case: casa_case, notes: "Case 1 Notes", occurred_at: Time.zone.yesterday - 1)
+      yesterday = Time.zone.yesterday
+      day_before_yesterday = yesterday - 1.day
+      today = Time.zone.today
+      create(:case_contact, creator: volunteer, casa_case: casa_case, notes: "Case 1 Notes", occurred_at: day_before_yesterday)
+
+      another_case_number = "CINA-2"
+      another_case = create(:casa_case, casa_org: organization, case_number: another_case_number)
+      create(:case_assignment, volunteer: volunteer, casa_case: another_case)
+      create(:case_contact, creator: volunteer, casa_case: another_case, notes: "Case 2 Notes", occurred_at: today)
+
+      # showing all cases
+      visit root_path
+      click_on "Case Contacts"
+      within "#ddmenu_case-contacts" do
+        click_on "All"
+      end
+      expect(page).to have_text("Case 1 Notes")
+      expect(page).to have_text("Case 2 Notes")
+
+      # showing case 1
+      visit root_path
+      click_on "Case Contacts"
+      within "#ddmenu_case-contacts" do
+        click_on case_number
+      end
+      expect(page).to have_text("Case 1 Notes")
+      expect(page).to have_no_text("Case 2 Notes")
+
+      # showing case 2
+      visit root_path
+      click_on "Case Contacts"
+      within "#ddmenu_case-contacts" do
+        click_on another_case_number
+      end
+      expect(page).to have_text("Case 2 Notes")
+      expect(page).to have_no_text("Case 1 Notes")
+
+      # filtering to only show case 2
+      click_on "Expand / Hide"
+      fill_in "filterrific_occurred_starting_at", with: yesterday
+      fill_in "filterrific_occurred_ending_at", with: Time.zone.tomorrow
+      click_on "Filter"
+      expect(page).to have_text("Case 2 Notes")
+      expect(page).to have_no_text("Case 1 Notes")
+
+      visit root_path
+      click_on "Case Contacts"
+      within "#ddmenu_case-contacts" do
+        click_on case_number
+      end
+      click_on "Expand / Hide"
+      fill_in "filterrific_occurred_starting_at", with: yesterday
+      fill_in "filterrific_occurred_ending_at", with: Time.zone.tomorrow
+      click_on "Filter"
+      # no contacts because we're only showing case 1 and that occurred before the filter dates
+      expect(page).to have_no_text("Case 1 Notes")
+      expect(page).to have_no_text("Case 2 Notes")
+    end
 
-        another_case_number = "CINA-2"
-        another_case = create(:casa_case, casa_org: organization, case_number: another_case_number)
-        create(:case_assignment, volunteer: volunteer, casa_case: another_case)
-        create(:case_contact, creator: volunteer, casa_case: another_case, notes: "Case 2 Notes", occurred_at: Time.zone.today)
+    describe "contact notes" do
+      let(:contact_topics) { create_list(:contact_topic, 2, casa_org: organization) }
+      let(:contact_topic) { contact_topics.first }
+      let(:case_contact) { create(:case_contact, casa_case:, creator: volunteer) }
+      let!(:contact_topic_answer) do
+        create(:contact_topic_answer, case_contact:, contact_topic:)
+      end
+      let(:user) { volunteer }
 
-        sign_in volunteer
+      before { sign_in user }
 
-        # showing all cases
-        visit root_path
-        click_on "Case Contacts"
-        within "#ddmenu_case-contacts" do
-          click_on "All"
-        end
-        expect(page).to have_text("Case 1 Notes")
-        expect(page).to have_text("Case 2 Notes")
-
-        # showing case 1
-        visit root_path
-        click_on "Case Contacts"
-        within "#ddmenu_case-contacts" do
-          click_on case_number
-        end
-        expect(page).to have_text("Case 1 Notes")
-        expect(page).to_not have_text("Case 2 Notes")
-
-        # showing case 2
-        visit root_path
-        click_on "Case Contacts"
-        within "#ddmenu_case-contacts" do
-          click_on another_case_number
-        end
-        expect(page).to have_text("Case 2 Notes")
-        expect(page).to_not have_text("Case 1 Notes")
-
-        # filtering to only show case 2
-        click_button "Expand / Hide"
-        fill_in "filterrific_occurred_starting_at", with: Time.zone.yesterday
-        fill_in "filterrific_occurred_ending_at", with: Time.zone.tomorrow
-        click_button "Filter"
-        expect(page).to have_text("Case 2 Notes")
-        expect(page).to_not have_text("Case 1 Notes")
-
-        # no contacts because we're only showing case 1 and that occurred before the filter dates
-        visit root_path
-        click_on "Case Contacts"
-        within "#ddmenu_case-contacts" do
-          click_on case_number
+      it "show topic answers and allows expanding to show full answer" do
+        subject
+
+        expect(page).to have_text contact_topics.first.question
+        expect(page).to have_no_text contact_topics.first.details
+
+        within(".truncation-container", match: :first) do
+          expect(page).to have_content(contact_topic.question)
+          # capybara has trouble with css `overflow: hidden` truncated text. just test class is applied/not
+          expect(page).to have_css(".line-clamp-1", text: contact_topic_answer.value)
+          click_on "read more"
+          expect(page).to have_no_css(".line-clamp-1")
+          expect(page).to have_content(contact_topic_answer.value)
+          expect(page).to have_no_content contact_topics.first.details
         end
-        expect(page).to_not have_text("Case 1 Notes")
-        expect(page).to_not have_text("Case 2 Notes")
       end
     end
   end
 
   context "without case contacts" do
-    before(:each) do
-      sign_in volunteer
-      visit case_contacts_path
-    end
     it "shows helper text" do
+      subject
       expect(page).to have_text("You have no case contacts for this case. Please click New Case Contact button above to create a case contact for your youth!")
     end
   end
diff --git a/spec/system/case_contacts/new_spec.rb b/spec/system/case_contacts/new_spec.rb
index 69b1050b72..c64a66fd3d 100644
--- a/spec/system/case_contacts/new_spec.rb
+++ b/spec/system/case_contacts/new_spec.rb
@@ -1,372 +1,524 @@
 require "rails_helper"
-require "action_view"
 
-RSpec.describe "case_contacts/new", type: :system, js: true do
-  include ActionView::Helpers::SanitizeHelper
+RSpec.describe "case_contacts/new", :js, type: :system do
+  let(:casa_org) { create :casa_org }
+  let(:contact_type_group) { create :contact_type_group, casa_org: }
+  let!(:school_contact_type) { create :contact_type, contact_type_group:, name: "School" }
+  let(:contact_types) { [school_contact_type] }
 
-  let(:casa_org) { build :casa_org }
-  let(:casa_case) { create :casa_case, :with_case_assignments, casa_org: }
+  let(:volunteer) { create :volunteer, :with_single_case, casa_org: }
+  let(:casa_admin) { create :casa_admin, casa_org: }
+  let(:casa_case) { volunteer.casa_cases.first }
   let(:case_number) { casa_case.case_number }
-  let(:contact_type_group) { build :contact_type_group, casa_org: }
-  let!(:school_contact_type) { create :contact_type, contact_type_group:, name: "School" }
-  let!(:therapist_contact_type) { create :contact_type, contact_type_group:, name: "Therapist" }
+
+  let(:user) { volunteer }
 
   before { sign_in user }
 
   subject { visit new_case_contact_path casa_case }
 
-  context "when admin" do
-    let(:user) { create :casa_admin, casa_org: }
-
-    it "does not display empty or hidden contact type groups; can create CaseContact" do
-      build(:contact_type_group, name: "Empty", casa_org:)
-      grp_with_hidden = build(:contact_type_group, name: "OnlyHiddenTypes", casa_org:)
-      create(:contact_type, name: "Hidden", active: false, contact_type_group: grp_with_hidden)
+  it "page load creates a case_contact with status: 'started' & draft_case_ids: [casa_case.id]" do
+    expect { subject }.to change(CaseContact.started, :count).by(1)
+    case_contact = CaseContact.started.last
+    expect(case_contact.draft_case_ids).to contain_exactly(casa_case.id)
+    expect(case_contact.casa_case_id).to be_nil
+  end
 
-      visit casa_case_path(casa_case)
-      # assert to wait for page loading, to reduce flakiness
-      expect(page).to have_text("CASA Case Details")
-      # does not show empty contact type groups
-      expect(page).to_not have_text("Empty")
-      # does not show contact type groups with only hidden contact types
-      expect(page).to_not have_text("Hidden")
+  it "saves entered details and updates status to 'active'" do
+    subject
+
+    expect(page).to have_text "New Case Contact"
+    case_contact = CaseContact.started.last
+
+    complete_details_page(
+      case_numbers: [case_number], contact_types: %w[School], contact_made: true,
+      medium: "In Person", occurred_on: Time.zone.yesterday, hours: 1, minutes: 45
+    )
+    click_on "Submit"
+    expect(page).to have_text "Case contact successfully created."
+
+    case_contact.reload
+    aggregate_failures do
+      expect(case_contact.status).to eq "active"
+      # entered details
+      expect(case_contact.draft_case_ids).to eq [casa_case.id]
+      expect(case_contact.occurred_at).to eq Time.zone.yesterday
+      expect(case_contact.contact_types.map(&:name)).to contain_exactly("School")
+      expect(case_contact.medium_type).to eq "in-person"
+      expect(case_contact.contact_made).to be true
+      expect(case_contact.duration_minutes).to eq 105
+      # skipped fields
+      expect(case_contact.want_driving_reimbursement).to be false
+      expect(case_contact.miles_driven).to be_zero
+      expect(case_contact.volunteer_address).to be_empty
+      expect(case_contact.notes).to be_nil
+      # associations
+      expect(case_contact.casa_case).to eq casa_case
+      expect(case_contact.creator).to eq volunteer
+      # other attributes
+      expect(case_contact.reimbursement_complete).to be false
+      expect(case_contact.status).to eq "active"
+      expect(case_contact.metadata).to be_present
+    end
+  end
 
-      click_on "New Case Contact"
+  context "with invalid inputs" do
+    it "re-renders the form with errors, preserving all previously entered selections" do
+      subject
       complete_details_page(
-        case_numbers: [], contact_types: %w[School Therapist], contact_made: true,
-        medium: "Video", occurred_on: Date.new(2020, 4, 5), hours: 1, minutes: 45
+        case_numbers: [], contact_types: %w[School], contact_made: true, medium: nil,
+        hours: 1, minutes: 45
       )
-      complete_notes_page
-      fill_in_expenses_page
 
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(1)
-      contact = CaseContact.last
-      expect(contact.casa_case_id).to eq casa_case.id
-      expect(contact.contact_types.map(&:name)).to include("School", "Therapist")
-      expect(contact.duration_minutes).to eq 105
+      expect { click_on "Submit" }.not_to change(CaseContact, :count)
+
+      expect(page).to have_text("Medium type can't be blank")
+
+      expect(page).to have_field("case_contact_duration_hours", with: 1)
+      expect(page).to have_field("case_contact_duration_minutes", with: 45)
+      expect(page).to have_field("case_contact_contact_made", with: "1")
+      expect(page).to have_field(class: "contact-form-type-checkbox", with: school_contact_type.id, checked: true)
     end
   end
 
-  context "volunteer user" do
-    let(:volunteer) { create :volunteer, :with_single_case, casa_org: }
-    let(:user) { volunteer }
-    let(:casa_case) { volunteer.casa_cases.first }
-
-    it "saves entered details" do
+  describe "contact types" do
+    it "requires a contact type" do
       subject
 
-      complete_details_page(
-        case_numbers: [case_number], contact_types: %w[School Therapist], contact_made: true,
-        medium: "In Person", occurred_on: Date.today, hours: 1, minutes: 45
-      )
-      complete_notes_page(notes: "Hello world")
-      fill_in_expenses_page(miles: 50, want_reimbursement: true, address: "123 Example St")
-      expect {
-        click_on "Submit"
-      }.to change { CaseContact.where(status: "active").count }.by(1)
-
-      case_contact = casa_case.case_contacts.last
-      aggregate_failures do
-        # associations
-        expect(case_contact.casa_case).to eq casa_case
-        expect(case_contact.creator).to eq user
-        expect(case_contact.contact_types.map(&:name)).to include("School", "Therapist")
-        # entered details
-        expect(case_contact.duration_minutes).to eq 105
-        expect(case_contact.contact_made).to be true
-        expect(case_contact.medium_type).to eq "in-person"
-        expect(case_contact.want_driving_reimbursement).to be true
-        expect(case_contact.miles_driven).to eq 50
-        expect(case_contact.draft_case_ids).to eq [casa_case.id]
-        expect(case_contact.volunteer_address).to eq "123 Example St"
-        expect(case_contact.occurred_at).to eq Date.today
-        expect(case_contact.notes).to eq "Hello world"
-        # other fields
-        expect(case_contact.reimbursement_complete).to be false
-        expect(case_contact.status).to eq "active"
-        expect(case_contact.metadata).to be_present
-      end
+      fill_in_contact_details(contact_types: nil)
+
+      expect { click_on "Submit" }.to not_change(CaseContact.active, :count)
+      expect(page).to have_text("Contact Type must be selected")
+      check contact_types.first.name
+      expect { click_on "Submit" }.to change(CaseContact.active, :count).by(1)
     end
 
-    it "is successful without 'miles_driven' or 'want_driving_reimbursement'" do
+    it "does not display empty contact groups or hidden contact types" do
+      create(:contact_type, name: "Shown Checkbox", contact_type_group:)
+      create(:contact_type_group, name: "Empty Group", casa_org:)
+      grp_with_hidden = build(:contact_type_group, name: "OnlyHiddenTypes", casa_org:)
+      create(:contact_type, name: "Hidden", active: false, contact_type_group: grp_with_hidden)
+
       subject
 
-      complete_details_page(
-        case_numbers: [case_number], contact_types: %w[School Therapist], contact_made: true,
-        medium: "In Person", occurred_on: Date.new(2020, 0o4, 0o6), hours: 1, minutes: 45
-      )
-      complete_notes_page(notes: "Hello world")
-      fill_in_expenses_page
-      expect { click_on "Submit" }.to change { CaseContact.where(status: "active").count }.by(1)
+      expect(page).to have_text(contact_type_group.name)
+      expect(page).to have_no_text("OnlyHiddenTypes")
+      expect(page).to have_no_text("Empty Group")
 
-      case_contact = casa_case.case_contacts.last
-      expect(case_contact.casa_case_id).to eq casa_case.id
-      expect(case_contact.contact_types.map(&:name)).to include("School", "Therapist")
-      expect(case_contact.duration_minutes).to eq 105
+      expect(page).to have_field(class: "contact-form-type-checkbox", count: 2)
+      expect(page).to have_field("School", class: "contact-form-type-checkbox")
+      expect(page).to have_field("Shown Checkbox", class: "contact-form-type-checkbox")
+      expect(page).to have_no_text("Empty")
+      expect(page).to have_no_text("Hidden")
+    end
+
+    context "when the case has case contact types assigned" do
+      let!(:casa_case) { create(:casa_case, :with_casa_case_contact_types, :with_one_case_assignment, casa_org:) }
+      let(:volunteer) { casa_case.volunteers.first }
+      let(:casa_case_contact_types) { casa_case.contact_types }
+
+      it "shows only the casa case's contact types" do
+        therapist_contact_type = create :contact_type, contact_type_group:, name: "Therapist"
+        expect(casa_org.contact_types).to contain_exactly(school_contact_type, therapist_contact_type, *casa_case_contact_types)
+        expect(casa_case_contact_types).not_to include([school_contact_type, therapist_contact_type])
+
+        subject
+
+        expect(page).to have_field(class: "contact-form-type-checkbox", with: casa_case_contact_types.first.id)
+        expect(page).to have_field(class: "contact-form-type-checkbox", with: casa_case_contact_types.last.id)
+        expect(page).to have_field(class: "contact-form-type-checkbox", count: casa_case_contact_types.size) # (no others)
+      end
     end
+  end
 
-    it "autosaves notes" do
+  describe "notes/contact topic answsers section" do
+    let(:contact_topics) do
+      [
+        create(:contact_topic, casa_org:, question: "Active Topic", active: true, soft_delete: false),
+        create(:contact_topic, casa_org:, question: "Inactive Not Soft Deleted", active: false, soft_delete: false),
+        create(:contact_topic, casa_org:, question: "Active Soft Deleted", active: true, soft_delete: true),
+        create(:contact_topic, casa_org:, question: "Inactive Soft Deleted", active: false, soft_delete: true)
+      ]
+    end
+    let(:notes_section_selector) { "#contact-form-notes" }
+    let(:autosave_alert_div) { "#contact-form-notes" }
+    let(:autosave_alert_css) { 'small[role="alert"]' }
+    let(:autosave_alert_text) { "Saved!" }
+    let(:autosave_wait_time) { 3 }
+
+    it "does not show topic questions that are inactive or soft deleted in select" do
+      contact_topics
       subject
 
+      within notes_section_selector do
+        expect(page).to have_select(class: "contact-topic-id-select", options: ["Active Topic", "Select a discussion topic"])
+        expect(page).to have_no_text("Inactive Not Soft Deleted")
+        expect(page).to have_no_text("Active Soft Deleted")
+        expect(page).to have_no_text("Inactive Soft Deleted")
+      end
+    end
+
+    it "autosaves notes & answers" do
+      contact_topics
+      expect { subject }.to change(CaseContact.started, :count).by(1)
+      case_contact = CaseContact.started.last
+
       complete_details_page(
-        case_numbers: [case_number], contact_types: %w[School Therapist], contact_made: true,
+        case_numbers: [case_number], contact_types: %w[School], contact_made: true,
         medium: "In Person", occurred_on: "04/04/2020", hours: 1, minutes: 45
       )
-      expect(CaseContact.last.notes).not_to eq "Hello world"
 
-      complete_notes_page(notes: "Hello world", click_continue: false)
+      answer_topic "Active Topic", "Hello world"
 
-      within 'div[data-controller="autosave"]' do
-        find('small[data-autosave-target="alert"]', text: "Saved!")
+      within autosave_alert_div do
+        find(autosave_alert_css, text: autosave_alert_text, wait: autosave_wait_time)
       end
 
-      expect(CaseContact.last.notes).to eq "Hello world"
+      expect(case_contact.reload.contact_topic_answers.first.value).to eq "Hello world"
     end
 
-    it "submits the form when no note was added" do
-      subject
+    context "when org has no contact topics" do
+      it "allows entering contact notes" do
+        expect(casa_org.contact_topics.size).to eq 0
+        subject
 
-      complete_details_page(
-        case_numbers: [case_number], contact_types: %w[School Therapist], contact_made: true,
-        medium: "In Person", occurred_on: "04/04/2020", hours: 1, minutes: 45
-      )
-      complete_notes_page(notes: "")
-      fill_in_expenses_page
+        fill_in_contact_details contact_types: %w[School]
 
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(1)
+        fill_in "Additional Notes", with: "This is the note"
+
+        expect {
+          click_on "Submit"
+        }.to change(CaseContact.active, :count).by(1)
+
+        case_contact = CaseContact.active.last
+        expect(case_contact.contact_topic_answers).to be_empty
+        expect(case_contact.notes).to eq "This is the note"
+      end
+
+      it "guides volunteer to contact admin" do
+        expect(casa_org.contact_topics.size).to eq 0
+        subject
+
+        expect(page).to have_text("Your organization has not set any Court Report Topics yet. Contact your admin to learn more.")
+      end
 
-      expect(CaseContact.first.notes).to eq ""
+      context "with admin user" do
+        let(:user) { casa_admin }
+
+        it "shows the admin the contact topics link" do
+          expect(casa_org.contact_topics.size).to eq 0
+          subject
+
+          expect(page).to have_link("Manage Case Contact Topics")
+        end
+      end
+
+      context "with supervisor user" do
+        let(:supervisor) { create :supervisor, casa_org: }
+        let(:user) { supervisor }
+
+        it "guides supervisor to contact admin" do
+          expect(casa_org.contact_topics.size).to eq 0
+          subject
+
+          expect(page).to have_text("Your organization has not set any Court Report Topics yet. Contact your admin to learn more.")
+        end
+      end
+    end
+  end
+
+  describe "reimbursement section" do
+    let(:casa_org) { build(:casa_org, :all_reimbursements_enabled) }
+
+    let(:reimbursement_section_id) { "#contact-form-reimbursement" }
+    let(:reimbursement_checkbox) { "case_contact_want_driving_reimbursement" }
+    let(:miles_driven_input) { "case_contact_miles_driven" }
+    let(:volunteer_address_input) { "case_contact_volunteer_address" }
+    let(:add_expense_button_text) { "Add Another Expense" }
+    let(:expense_amount_class) { "expense-amount-input" }
+    let(:expense_describe_class) { "expense-describe-input" }
+
+    before do
+      allow(Flipper).to receive(:enabled?).with(:show_additional_expenses).and_return(true)
+      allow(Flipper).to receive(:enabled?).with(:reimbursement_warning, casa_org).and_call_original
     end
 
-    it "submits the form when note is added" do
+    it "is not shown until 'Request travel or other reimbursement' is checked" do
       subject
 
-      complete_details_page(
-        case_numbers: [case_number], contact_types: %w[School Therapist], contact_made: true,
-        medium: "In Person", occurred_on: "04/04/2020", hours: 1, minutes: 45
-      )
-      complete_notes_page(notes: "This is the note")
-      fill_in_expenses_page
+      expect(page).to have_no_field(miles_driven_input)
+      expect(page).to have_no_field(volunteer_address_input)
+      expect(page).to have_no_button(add_expense_button_text)
 
-      expect {
-        click_on "Submit"
-      }.to change(CaseContact.active, :count).by(1)
+      check reimbursement_checkbox
 
-      expect(CaseContact.first.notes).to eq "This is the note"
+      expect(page).to have_field(miles_driven_input)
+      expect(page).to have_field(volunteer_address_input)
+      expect(page).to have_button(add_expense_button_text)
     end
 
-    context "with invalid inputs" do
-      it "re-renders the form with errors, but preserving all previously entered selections" do
-        subject
-        complete_details_page(
-          case_numbers: [case_number], contact_types: %w[School], contact_made: true, medium: nil,
-          occurred_on: "04/04/2020", hours: 1, minutes: 45
-        )
-        expect(page).to have_text("Medium type can't be blank")
-
-        choose_medium("In Person")
-        complete_notes_page
-        fill_in_expenses_page(want_reimbursement: true)
-        click_on "Submit"
-        expect(page).to have_text("Must enter miles driven to receive driving reimbursement.")
-      end
+    it "clears mileage info if reimbursement unchecked" do
+      subject
+      fill_in_contact_details contact_types: %w[School]
+
+      check reimbursement_checkbox
+      fill_in miles_driven_input, with: 50
+      fill_in volunteer_address_input, with: "123 Example St"
+      uncheck reimbursement_checkbox
+
+      expect { click_on "Submit" }.to change(CaseContact.active, :count).by(1)
+      case_contact = CaseContact.active.last
+
+      expect(case_contact.want_driving_reimbursement).to be false
+      expect(case_contact.miles_driven).to be_zero
     end
 
-    context "with no contact types set for the volunteer's cases" do
-      before { expect(casa_case.contact_types).to be_empty }
+    it "saves mileage and address information" do
+      subject
+      fill_in_contact_details contact_types: %w[School]
 
-      it "renders all of the org's contact types" do
-        subject
+      check reimbursement_checkbox
 
-        find("#case_contact_contact_type_ids-ts-control").click
-        expect(page).to have_text("School")
-        expect(page).to have_text("Therapist")
-      end
+      fill_in miles_driven_input, with: 50
+      fill_in volunteer_address_input, with: "123 Example St"
+
+      expect { click_on "Submit" }.to change(CaseContact.active, :count).by(1)
+      case_contact = CaseContact.active.last
+
+      expect(case_contact.want_driving_reimbursement).to be true
+      expect(case_contact.volunteer_address).to eq "123 Example St"
+      expect(case_contact.miles_driven).to eq 50
     end
 
-    context "with specific contact types allowed for the volunteer's cases" do
-      let!(:attorney_contact_type) { create :contact_type, contact_type_group:, name: "Attorney" }
+    it "does not accept decimal mileage" do
+      subject
+      complete_details_page
 
-      before { casa_case.update!(contact_types: [school_contact_type, therapist_contact_type]) }
+      check reimbursement_checkbox
 
-      it "only renders contact types that are allowed for the volunteer's cases" do
-        expect(casa_org.contact_types.map(&:name)).to include("Attorney")
-        subject
+      fill_in miles_driven_input, with: 50.5
+      fill_in volunteer_address_input, with: "123 Example St"
 
-        within find("#contact-type-id-selector") do
-          find(".ts-control").click
-        end
+      expect { click_on "Submit" }.not_to change(CaseContact.active, :count)
+    end
 
-        expect(page).not_to have_text("Attorney")
-        expect(page).to have_text("School")
-        expect(page).to have_text("Therapist")
-      end
+    it "requires inputs if checkbox checked" do
+      subject
+      complete_details_page
+
+      check reimbursement_checkbox
+
+      expect { click_on "Submit" }.not_to change(CaseContact.active, :count)
+      expect(page).to have_text("Must enter a valid mailing address for the reimbursement")
+      expect(page).to have_text("Must enter miles driven to receive driving reimbursement")
     end
 
-    context "when driving reimbursement is hidden by the CASA org" do
-      let(:casa_org) { build(:casa_org, show_driving_reimbursement: false) }
+    context "when volunteer case assignment reimbursement is false" do
+      let(:volunteer) { create :volunteer, :with_disallow_reimbursement, casa_org: }
+      let(:casa_case) { volunteer.casa_cases.last }
 
-      it "skips reimbursement (step 3)" do
+      it "does not show reimbursement section" do
         subject
 
-        complete_details_page(
-          case_numbers: [case_number], contact_types: %w[School], contact_made: true, medium: "In Person"
-        )
-        complete_notes_page(click_continue: false)
-        expect(page).to have_text("Step 2 of 2")
-        click_on "Submit"
-        expect(page).to have_text("Case contact successfully created")
+        expect(page).to have_no_button(add_expense_button_text)
+        expect(page).to have_no_field(miles_driven_input)
+        expect(page).to have_no_field(volunteer_address_input)
+        expect(page).to have_no_field(reimbursement_checkbox)
+        expect(page).to have_no_selector(reimbursement_section_id)
+        expect(page).to have_no_text("reimbursement")
       end
     end
 
-    context "when driving reimbursement is hidden when volunteer not allowed to request" do
-      let(:casa_org) { build(:casa_org, show_driving_reimbursement: true) }
-      let(:volunteer) { create(:volunteer, :with_disallow_reimbursement, casa_org:) }
+    context "when casa org driving reimbursement false, additional expenses true" do
+      before { casa_org.update! show_driving_reimbursement: false }
 
-      it "does not show for case_contacts" do
+      it "does not render the reimbursement section" do
         subject
 
-        complete_details_page(case_numbers: [case_number], contact_types: %w[School], contact_made: true, medium: "In Person")
-        complete_notes_page
-
-        expect(page).not_to have_field("b. Want Driving Reimbursement")
+        expect(page).to have_no_field(reimbursement_checkbox, visible: :all)
+        expect(page).to have_no_field(miles_driven_input, visible: :all)
+        expect(page).to have_no_field(volunteer_address_input, visible: :all)
+        expect(page).to have_no_button(add_expense_button_text, visible: :all)
+        expect(page).to have_no_field(class: "expense-amount-input")
+        expect(page).to have_no_field(class: "expense-describe-input")
+        expect(page).to have_no_text("reimbursement")
       end
     end
 
-    context "when 'Create Another' is checked" do
-      it "redirects to the new CaseContact form with the same case selected" do
+    context "when casa org additional expenses false" do
+      before { casa_org.update! additional_expenses_enabled: false }
+
+      it "enables mileage reimbursement but does shows additional expenses" do
         subject
-        complete_details_page(
-          case_numbers: [case_number], contact_types: %w[School Therapist], contact_made: true,
-          medium: "In Person", occurred_on: Date.today, hours: 1, minutes: 45
-        )
-        complete_notes_page(notes: "Hello world")
 
-        check "Create Another"
-        submitted_case_contact = CaseContact.last
-        expect { click_on "Submit" }.to change { CaseContact.count }.by(1)
-        next_case_contact = CaseContact.last
-
-        expect(page).to have_text "Step 1 of 3"
-        # store that the submitted contact used 'create another' in metadata
-        expect(submitted_case_contact.reload.metadata["create_another"]).to be true
-        # new contact uses draft_case_ids from the original & form selects them
-        expect(next_case_contact.draft_case_ids).to eq [casa_case.id]
-        expect(page).to have_text case_number
-        # default values for other attributes (not from the last contact)
-        expect(next_case_contact.status).to eq "started"
-        expect(next_case_contact.miles_driven).to be_zero
-        %i[casa_case_id duration_minutes occurred_at medium_type
-          want_driving_reimbursement notes].each do |attribute|
-          expect(next_case_contact.send(attribute)).to be_blank
-        end
-        expect(next_case_contact.contact_made).to be true
-      end
+        complete_details_page(case_numbers: [case_number], contact_types: %w[School])
 
-      it "does not reset referring location" do
-        visit casa_case_path casa_case
-        # referrer will be set by CaseContactsController#new to casa_case_path(casa_case)
-        click_on "New Case Contact"
-        complete_details_page contact_made: true, medium: "In Person"
-        complete_notes_page
+        check reimbursement_checkbox
 
-        # goes through CaseContactsController#new, but should not set a referring location
-        check "Create Another"
-        click_on "Submit"
+        expect(page).to have_field(miles_driven_input)
+        expect(page).to have_field(volunteer_address_input)
 
-        complete_details_page contact_made: true, medium: "In Person"
-        complete_notes_page
+        expect(page).to have_no_button(add_expense_button_text)
+        expect(page).to have_no_field(class: "expense-amount-input", visible: :all)
+        expect(page).to have_no_field(class: "expense-describe-input", visible: :all)
+      end
+    end
 
-        click_on "Submit"
-        # update should redirect to the original referrer, casa_case_path(casa_case)
-        expect(page).to have_text "CASA Case Details"
-        expect(page).to have_text "Case number: #{case_number}"
+    context "when casa org does not allow mileage or expense reimbursement" do
+      let(:casa_org) { create :casa_org, show_driving_reimbursement: false, additional_expenses_enabled: false }
+
+      it "does not show reimbursement section" do
+        subject
+
+        expect(page).to have_no_button(add_expense_button_text)
+        expect(page).to have_no_field(miles_driven_input)
+        expect(page).to have_no_field(volunteer_address_input)
+        expect(page).to have_no_field(reimbursement_checkbox)
+        expect(page).to have_no_selector(reimbursement_section_id)
+        expect(page).to have_no_text("reimbursement")
       end
+    end
+  end
 
-      context "multiple cases selected" do
-        let(:volunteer) { create(:volunteer, :with_casa_cases, casa_org:) }
-        let(:casa_case_two) { volunteer.casa_cases.second }
-        let(:case_number_two) { casa_case_two.case_number }
+  context "when 'Create Another' is checked" do
+    it "redirects to the new CaseContact form with the same case selected" do
+      subject
+      complete_details_page(
+        case_numbers: [case_number], contact_types: %w[School], contact_made: true,
+        medium: "In Person", occurred_on: Date.today, hours: 1, minutes: 45
+      )
 
-        it "redirects to the new CaseContact form with the same cases selected" do
-          subject
-          complete_details_page(
-            case_numbers: [case_number, case_number_two], contact_made: true, medium: "In Person"
-          )
-          complete_notes_page
-          check "Create Another"
-          click_on "Submit"
-          expect(page).to have_text "Step 1 of 3"
-          next_case_contact = CaseContact.last
-          expect(next_case_contact.draft_case_ids).to match_array [casa_case.id, casa_case_two.id]
-          expect(page).to have_text case_number
-          expect(page).to have_text case_number_two
-        end
+      check "Create Another"
+      expect { click_on "Submit" }
+        .to change(CaseContact, :count).by(1)
+      # .to change(CaseContact.active, :count).by(1)
+      # .and change(CaseContact.started, :count).by(1)
+      submitted_case_contact = CaseContact.active.last
+      next_case_contact = CaseContact.started.last
+
+      expect(page).to have_text "New Case Contact"
+      expect(submitted_case_contact.reload.metadata["create_another"]).to be true
+      # new contact uses draft_case_ids from the original & form selects them
+      expect(next_case_contact.draft_case_ids).to eq [casa_case.id]
+      expect(page).to have_text case_number
+      # default values for other attributes (not from the last contact)
+      expect(next_case_contact.status).to eq "started"
+      expect(next_case_contact.miles_driven).to be_zero
+      %i[casa_case_id duration_minutes occurred_at medium_type
+        want_driving_reimbursement notes].each do |attribute|
+        expect(next_case_contact.send(attribute)).to be_blank
       end
+      expect(next_case_contact.contact_made).to be true
     end
 
-    describe "differences in single vs. multiple cases" do
-      let(:first_case) { volunteer.casa_cases.first }
+    it "does not reset referring location" do
+      visit casa_case_path casa_case
+      # referrer will be set by CaseContactsController#new to casa_case_path(casa_case)
+      click_on "New Case Contact"
+      fill_in_contact_details contact_types: %w[School]
 
-      context "multiple cases" do
-        let(:volunteer) { create(:volunteer, :with_casa_cases, casa_org:) }
-        let(:second_case) { volunteer.casa_cases.second }
+      # goes through CaseContactsController#new, but should not set a referring location
+      check "Create Another"
+      click_on "Submit"
 
-        context "case default selection" do
-          it "selects no cases" do
-            subject
+      fill_in_contact_details contact_types: %w[School]
 
-            expect(page).not_to have_text(first_case.case_number)
-            expect(page).not_to have_text(second_case.case_number)
-          end
+      click_on "Submit"
+      # update should redirect to the original referrer, casa_case_path(casa_case)
+      expect(page).to have_text "CASA Case Details"
+      expect(page).to have_text "Case number: #{case_number}"
+    end
 
-          it "warns user about using the back button on step 1" do
-            subject
+    context "when multiple cases selected" do
+      let(:volunteer) { create(:volunteer, :with_casa_cases, casa_org:) }
+      let(:casa_case) { volunteer.casa_cases.first }
+      let(:casa_case_two) { volunteer.casa_cases.second }
+      let(:case_number_two) { casa_case_two.case_number }
+      let!(:draft_case_ids) { [casa_case.id, casa_case_two.id] }
 
-            click_on "Back"
-            expect(page).to have_selector("h2", text: "Discard draft?")
-          end
+      it "redirects to the new CaseContact form with the same cases selected" do
+        expect {
+          visit new_case_contact_path(casa_case, {draft_case_ids:})
+        }.to change(CaseContact.started, :count).by(1)
+        this_case_contact = CaseContact.started.last
 
-          context "when there are params defined" do
-            it "select the cases defined in the params" do
-              visit new_case_contact_path(case_contact: {casa_case_id: first_case.id})
+        expect(page).to have_select("case_contact_draft_case_ids", selected: [case_number, case_number_two])
+        complete_details_page(case_numbers: [])
+        expect(page).to have_select("case_contact_draft_case_ids", selected: [case_number, case_number_two])
 
-              expect(page).to have_text(first_case.case_number)
-              expect(page).not_to have_text(second_case.case_number)
-            end
+        check "Create Another"
 
-            it "does not warn user when clicking the back button" do
-              visit new_case_contact_path(case_contact: {casa_case_id: first_case.id})
+        expect {
+          click_on "Submit"
+        }.to change(CaseContact.active, :count).by(2)
 
-              click_on "Back"
-              expect(page).to have_selector("h1", text: "Case Contacts")
-              expect(page).to have_selector("a", text: "New Case Contact")
-            end
-          end
-        end
+        expect(page).to have_text "New Case Contact"
+        expect(this_case_contact.reload.status).to eq "active"
+        next_case_contact = CaseContact.not_active.last
+        expect(next_case_contact).to be_present
+
+        expect(next_case_contact.status).to eq "started"
+        expect(page).to have_text case_number
+        expect(page).to have_text case_number_two
+        expect(next_case_contact.draft_case_ids).to match_array draft_case_ids
       end
+    end
+  end
 
-      context "single case" do
-        let(:volunteer) { create(:volunteer, :with_single_case) }
+  context "when volunteer has multiple cases" do
+    let!(:volunteer) { create(:volunteer, :with_casa_cases, casa_org:) }
+    let!(:first_case) { volunteer.casa_cases.first }
+    let!(:second_case) { volunteer.casa_cases.second }
 
-        it "selects the only case" do
-          subject
+    describe "case default selection" do
+      it "selects no cases" do
+        subject
 
-          expect(page).to have_text(first_case.case_number)
-        end
+        expect(page).to have_no_text(first_case.case_number)
+        expect(page).to have_no_text(second_case.case_number)
+      end
 
-        it "does not warn user when clicking the back button" do
+      context "when there are params defined" do
+        it "select the cases defined in the params" do
           visit new_case_contact_path(case_contact: {casa_case_id: first_case.id})
 
-          click_on "Back"
-          expect(page).to have_selector("h1", text: "Case Contacts")
-          expect(page).to have_selector("a", text: "New Case Contact")
+          expect(page).to have_text(first_case.case_number)
+          expect(page).to have_no_text(second_case.case_number)
         end
       end
     end
   end
+
+  context "when volunteer has one case" do
+    let!(:first_case) { volunteer.casa_cases.first }
+
+    it "selects the only case" do
+      expect(volunteer.casa_cases.size).to eq 1
+
+      subject
+
+      expect(page).to have_text(first_case.case_number)
+    end
+  end
+
+  context "with admin user" do
+    let(:user) { casa_admin }
+
+    it "can create CaseContact" do
+      subject
+
+      complete_details_page(
+        case_numbers: [], contact_types: %w[School], contact_made: true,
+        medium: "Video", occurred_on: Date.new(2020, 4, 5), hours: 1, minutes: 45
+      )
+
+      expect {
+        click_on "Submit"
+      }.to change(CaseContact.active, :count).by(1)
+      contact = CaseContact.active.last
+      expect(contact.casa_case_id).to eq casa_case.id
+      expect(contact.contact_types.map(&:name)).to include("School")
+      expect(contact.duration_minutes).to eq 105
+    end
+  end
 end
diff --git a/spec/views/case_contacts/case_contact.html.erb_spec.rb b/spec/views/case_contacts/case_contact.html.erb_spec.rb
index 5c20eeed9c..b0ab14363c 100644
--- a/spec/views/case_contacts/case_contact.html.erb_spec.rb
+++ b/spec/views/case_contacts/case_contact.html.erb_spec.rb
@@ -1,9 +1,10 @@
 require "rails_helper"
 
 RSpec.describe "case_contacts/case_contact", type: :view do
-  let(:admin) { build_stubbed(:casa_admin) }
-  let(:volunteer) { build_stubbed(:volunteer) }
-  let(:supervisor) { build_stubbed(:supervisor) }
+  let(:casa_org) { create(:casa_org) }
+  let(:admin) { build_stubbed(:casa_admin, casa_org:) }
+  let(:volunteer) { create(:volunteer, casa_org:) }
+  let(:supervisor) { build_stubbed(:supervisor, casa_org:) }
 
   describe "case contact notes" do
     before do
@@ -13,7 +14,7 @@
 
     context "when case contact has contact topic responses" do
       let(:case_contact) do
-        build_stubbed(:case_contact, contact_topic_answers: [contact_topic_answer1, contact_topic_answer2])
+        build_stubbed(:case_contact, contact_topic_answers: [contact_topic_answer1, contact_topic_answer2], creator: volunteer)
       end
 
       let(:contact_topic1) { build_stubbed(:contact_topic, question: "Some question") }
@@ -74,8 +75,8 @@
     end
 
     context "occurred_at is before the last day of the month in the quarter that the case contact was created" do
-      let(:case_contact) { build_stubbed(:case_contact) }
-      let(:case_contact2) { build_stubbed(:case_contact, deleted_at: Time.current) }
+      let(:case_contact) { build_stubbed(:case_contact, creator: volunteer) }
+      let(:case_contact2) { build_stubbed(:case_contact, deleted_at: Time.current, creator: volunteer) }
 
       it "shows edit button" do
         assign :case_contact, case_contact
@@ -96,8 +97,8 @@
   end
 
   describe "delete and undelete buttons" do
-    let(:case_contact) { build_stubbed(:case_contact) }
-    let(:case_contact2) { build_stubbed(:case_contact, deleted_at: Time.current) }
+    let(:case_contact) { build_stubbed(:case_contact, creator: volunteer) }
+    let(:case_contact2) { build_stubbed(:case_contact, deleted_at: Time.current, creator: volunteer) }
 
     context "when logged in as admin" do
       before do