From d799030370c88e758889b1f9d09e4deca17b350f Mon Sep 17 00:00:00 2001
From: Daniel Orner <daniel.orner@wishabi.com>
Date: Wed, 14 Dec 2022 07:11:43 -0500
Subject: [PATCH] 3197: Merge partner records (#3214)

* 3197: Merge partner records (WIP)

* 3197: Request merging

* Lint fixes

* Spec and lint fixes

* More spec fixes

* More spec and lint fixes

* last fix???

* Fix migrations to handle bad data

* Fix merge error

* Fix DB migrations

* Fix but that prevented partners from updating their profile info

* QA fixes

* Spec fixes

* Last fixes (finger cross)

Co-authored-by: Edwin <edwinthinks@gmail.com>
---
 app/assets/stylesheets/application.scss       |   1 +
 .../partners/approval_requests_controller.rb  |   2 +-
 app/controllers/partners/base_controller.rb   |   2 +-
 .../partners/children_controller.rb           |   4 +-
 .../partners/dashboards_controller.rb         |  16 ++-
 .../partners/distributions_controller.rb      |   5 +-
 .../individuals_requests_controller.rb        |   4 +-
 .../partners/profiles_controller.rb           |  12 +-
 .../partners/requests_controller.rb           |  12 +-
 app/controllers/partners_controller.rb        |   4 +-
 app/controllers/profiles_controller.rb        |  18 +--
 app/helpers/partners_helper.rb                |  10 +-
 app/models/partner.rb                         | 112 ++++++++++++++----
 app/models/partners/family.rb                 |   3 +-
 app/models/partners/item_request.rb           |  19 +--
 app/models/partners/partner_form.rb           |  16 ---
 .../partners/{partner.rb => profile.rb}       | 105 +---------------
 app/models/partners/request.rb                |  30 -----
 app/models/request.rb                         |   4 +
 app/models/role.rb                            |  13 +-
 app/models/user.rb                            |   7 +-
 app/services/organization_update_service.rb   |   9 --
 app/services/partner_approval_service.rb      |   5 -
 app/services/partner_create_service.rb        |   3 +-
 app/services/partner_deactivate_service.rb    |   3 -
 app/services/partner_invite_service.rb        |   2 +-
 app/services/partner_reactivate_service.rb    |   3 -
 ...partner_request_recertification_service.rb |   1 -
 .../partners/family_request_create_service.rb |   3 +-
 .../partners/request_approval_service.rb      |   3 +-
 .../partners/request_create_service.rb        |  35 ++----
 .../reports/partner_info_report_service.rb    |   2 +-
 .../partners/navigation/_navbar.html.erb      |   2 +-
 .../partners/navigation/_sidebar.html.erb     |   2 +-
 app/views/partners/dashboards/show.html.erb   |   4 +-
 .../partners/distributions/index.html.erb     |   4 +-
 app/views/partners/profiles/edit.html.erb     |  30 ++---
 .../edit/_agency_information.html.erb         |  24 ++--
 .../profiles/edit/_agency_stability.html.erb  |   4 +-
 .../edit/_attached_documents.html.erb         |   4 +-
 app/views/partners/profiles/show.html.erb     |  12 +-
 .../_agency_distribution_information.html.erb |   6 +-
 .../show/_agency_information.html.erb         |  26 ++--
 .../profiles/show/_agency_stability.html.erb  |  34 +++---
 .../show/_attached_documents.html.erb         |   4 +-
 .../show/_diaper_pick_up_person.html.erb      |   6 +-
 .../show/_executive_director.html.erb         |  14 +--
 .../profiles/show/_media_information.html.erb |  10 +-
 .../show/_organizational_capacity.html.erb    |   6 +-
 .../profiles/show/_partner_settings.html.erb  |  12 +-
 .../profiles/show/_population_served.html.erb |  30 ++---
 .../show/_sources_of_funding.html.erb         |   8 +-
 .../requests/_request_options_card.html.erb   |   6 +-
 app/views/partners/requests/index.html.erb    |   2 +-
 app/views/partners/requests/new.html.erb      |   3 +-
 app/views/profiles/edit.html.erb              |  24 ++--
 app/views/requests/show.html.erb              |   3 +-
 db/migrate/20220819194804_migrate_roles.rb    |   2 +-
 .../20221028192638_move_partner_for_roles.rb  |  30 +++++
 ...0221028194319_move_partner_for_families.rb |  60 ++++++++++
 .../20221104191611_move_item_request_index.rb |  44 +++++++
 db/schema.rb                                  |  10 +-
 db/seeds.rb                                   |  67 ++---------
 spec/factories/partner_user.rb                |   2 +-
 spec/factories/partners.rb                    |   6 +-
 spec/factories/partners/family.rb             |   2 +-
 .../partners/{partner.rb => profile.rb}       |   3 +-
 spec/factories/partners/user.rb               |   2 +-
 spec/factories/roles.rb                       |  13 +-
 spec/mailers/custom_devise_mailer_spec.rb     |   8 +-
 spec/models/partner_spec.rb                   |  61 +++++++---
 spec/models/partners/family_spec.rb           |   1 +
 spec/models/partners/item_request_spec.rb     |  19 +--
 spec/models/partners/partner_form_spec.rb     |  25 ----
 .../{partner_spec.rb => profile_spec.rb}      | 102 +---------------
 spec/models/partners/request_spec.rb          |  31 -----
 spec/models/role_spec.rb                      |  13 +-
 spec/requests/dashboard_requests_spec.rb      |   2 +-
 .../partners/children_requests_spec.rb        |   5 +-
 .../partners/dashboard_requests_spec.rb       |   2 +-
 spec/requests/partners/distributions_spec.rb  |   2 +-
 .../family_requests_controller_spec.rb        |  15 ++-
 .../requests/partners/family_requests_spec.rb |  11 +-
 .../partners/profiles_requests_spec.rb        |  37 ++++++
 spec/requests/partners/requests_spec.rb       |  16 +--
 spec/requests/partners/user_requests_spec.rb  |   2 +-
 spec/requests/partners_requests_spec.rb       |  20 ++--
 spec/requests/profiles_requests_spec.rb       |  14 +--
 spec/requests/users_requests_spec.rb          |   2 +-
 .../organization_update_service_spec.rb       |  48 --------
 .../services/partner_approval_service_spec.rb |   8 --
 spec/services/partner_create_service_spec.rb  |   6 +-
 spec/services/partner_invite_service_spec.rb  |   8 +-
 ...er_request_recertification_service_spec.rb |   8 --
 .../family_request_create_service_spec.rb     |  23 +---
 .../partners/request_approval_service_spec.rb |   8 +-
 .../partners/request_create_service_spec.rb   |  48 +-------
 .../partner_info_report_service_spec.rb       |   6 +-
 spec/system/partner_system_spec.rb            |   8 +-
 spec/system/partners/approval_process_spec.rb |   8 +-
 .../coworker_invitations_system_spec.rb       |   2 +-
 .../partners/family_requests_system_spec.rb   |   9 +-
 spec/system/partners/helps_system_spec.rb     |   4 +-
 .../partners/managing_requests_system_spec.rb |  24 ++--
 .../partner_distribution_system_spec.rb       |   2 +-
 spec/system/sign_in_system_spec.rb            |   2 +-
 106 files changed, 697 insertions(+), 902 deletions(-)
 delete mode 100644 app/models/partners/partner_form.rb
 rename app/models/partners/{partner.rb => profile.rb} (59%)
 delete mode 100644 app/models/partners/request.rb
 create mode 100644 db/migrate/20221028192638_move_partner_for_roles.rb
 create mode 100644 db/migrate/20221028194319_move_partner_for_families.rb
 create mode 100644 db/migrate/20221104191611_move_item_request_index.rb
 rename spec/factories/partners/{partner.rb => profile.rb} (51%)
 delete mode 100644 spec/models/partners/partner_form_spec.rb
 rename spec/models/partners/{partner_spec.rb => profile_spec.rb} (58%)
 delete mode 100644 spec/models/partners/request_spec.rb
 create mode 100644 spec/requests/partners/profiles_requests_spec.rb

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index c9e13b77c7..534002610c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -159,3 +159,4 @@ body a {
 body:not(.sidebar-mini-md) .content-wrapper, body:not(.sidebar-mini-md) .main-footer, body:not(.sidebar-mini-md) .main-header {
   margin-left: 280px;
 }
+
diff --git a/app/controllers/partners/approval_requests_controller.rb b/app/controllers/partners/approval_requests_controller.rb
index 31b5e08bf3..e4bc36b15e 100644
--- a/app/controllers/partners/approval_requests_controller.rb
+++ b/app/controllers/partners/approval_requests_controller.rb
@@ -1,7 +1,7 @@
 module Partners
   class ApprovalRequestsController < BaseController
     def create
-      svc = Partners::RequestApprovalService.new(partner: current_partner.partner)
+      svc = Partners::RequestApprovalService.new(partner: current_partner)
       svc.call
 
       if svc.errors.none?
diff --git a/app/controllers/partners/base_controller.rb b/app/controllers/partners/base_controller.rb
index ce4084eec0..090256c1c0 100644
--- a/app/controllers/partners/base_controller.rb
+++ b/app/controllers/partners/base_controller.rb
@@ -23,7 +23,7 @@ def verify_partner_is_active
     end
 
     def authorize_verified_partners
-      return if current_partner.verified?
+      return if current_partner.approved?
 
       redirect_to partners_requests_path, notice: "Please review your application details and submit for approval in order to make a new request."
     end
diff --git a/app/controllers/partners/children_controller.rb b/app/controllers/partners/children_controller.rb
index 53a7ae1ecd..64b8033934 100644
--- a/app/controllers/partners/children_controller.rb
+++ b/app/controllers/partners/children_controller.rb
@@ -36,7 +36,7 @@ def new
       family = current_partner.families.find_by!(id: params[:family_id])
       @child = family.children.new
 
-      requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.partner.id).call
+      requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.id).call
       @formatted_requestable_items = requestable_items.map do |rt|
         [rt.name, rt.id]
       end
@@ -50,7 +50,7 @@ def active
 
     def edit
       @child = current_partner.children.find_by(id: params[:id])
-      requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.partner.id).call
+      requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.id).call
       @formatted_requestable_items = requestable_items.map do |rt|
         [rt.name, rt.id]
       end
diff --git a/app/controllers/partners/dashboards_controller.rb b/app/controllers/partners/dashboards_controller.rb
index 70a12d709b..e5c5864da7 100644
--- a/app/controllers/partners/dashboards_controller.rb
+++ b/app/controllers/partners/dashboards_controller.rb
@@ -9,19 +9,17 @@ def index; end
     def show
       @partner = current_partner
       @partner_requests = @partner.requests.order(created_at: :desc).limit(10)
-      @upcoming_distributions = ::Partner.find(@partner.partner_id)
-                                         .distributions.order(issued_at: :desc)
-                                         .where('issued_at >= ?', Time.zone.today)
-      @distributions = ::Partner.find(@partner.partner_id)
-                                .distributions.order(issued_at: :desc)
-                                .where('issued_at < ?', Time.zone.today)
-                                .limit(5)
+      @upcoming_distributions = @partner.distributions.order(issued_at: :desc)
+                                        .where('issued_at >= ?', Time.zone.today)
+      @distributions = @partner.distributions.order(issued_at: :desc)
+                               .where('issued_at < ?', Time.zone.today)
+                               .limit(5)
 
-      @parent_org = Organization.find(@partner.essentials_bank_id)
+      @parent_org = Organization.find(@partner.organization_id)
 
       @requests_in_progress = @parent_org
                               .ordered_requests
-                              .where(partner: @partner.partner_id)
+                              .where(partner: @partner.id)
                               .where(status: 0)
 
       @families = @partner.families
diff --git a/app/controllers/partners/distributions_controller.rb b/app/controllers/partners/distributions_controller.rb
index 749545aa83..4c30987f77 100644
--- a/app/controllers/partners/distributions_controller.rb
+++ b/app/controllers/partners/distributions_controller.rb
@@ -7,10 +7,9 @@ class DistributionsController < BaseController
 
     def index
       @partner = current_partner
-      @distributions = ::Partner.find(@partner.partner_id)
-        .distributions.order(issued_at: :desc)
+      @distributions = @partner.distributions.order(issued_at: :desc)
 
-      @parent_org = Organization.find(@partner.essentials_bank_id)
+      @parent_org = Organization.find(@partner.organization_id)
     end
 
     def print
diff --git a/app/controllers/partners/individuals_requests_controller.rb b/app/controllers/partners/individuals_requests_controller.rb
index d9256a83a3..45c109ef82 100644
--- a/app/controllers/partners/individuals_requests_controller.rb
+++ b/app/controllers/partners/individuals_requests_controller.rb
@@ -3,7 +3,7 @@ class IndividualsRequestsController < BaseController
     def new
       @request = FamilyRequest.new({}, initial_items: 1)
 
-      requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.partner.id).call
+      requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.id).call
       @formatted_requestable_items = requestable_items.map do |rt|
         [rt.name, rt.id]
       end.sort
@@ -24,7 +24,7 @@ def create
       else
         @request = FamilyRequest.new({}, initial_items: 1)
         @errors = create_service.errors
-        @requestable_items = Organization.find(current_partner.essentials_bank_id).valid_items.map do |item|
+        @requestable_items = Organization.find(current_partner.organization_id).valid_items.map do |item|
           [item[:name], item[:id]]
         end.sort
 
diff --git a/app/controllers/partners/profiles_controller.rb b/app/controllers/partners/profiles_controller.rb
index 4be0cdffcd..c2ddfbda37 100644
--- a/app/controllers/partners/profiles_controller.rb
+++ b/app/controllers/partners/profiles_controller.rb
@@ -5,7 +5,7 @@ def show; end
     def edit; end
 
     def update
-      if current_partner.update(partner_params)
+      if current_partner.update(partner_params) && current_partner.profile.update(profile_params)
         flash[:success] = "Details were successfully updated."
         redirect_to partners_profile_path
       else
@@ -16,11 +16,13 @@ def update
     private
 
     def partner_params
-      params.require(:partners_partner).permit(
-        :name,
+      params.require(:partner).permit(:name)
+    end
+
+    def profile_params
+      params.require(:profile).permit(
         :agency_type,
         :other_agency_type,
-        :partner_status,
         :proof_of_partner_status,
         :agency_mission,
         :address1,
@@ -88,7 +90,7 @@ def partner_params
         :enable_individual_requests,
         :enable_quantity_based_requests,
         documents: []
-      )
+      ).select { |_, v| v.present? }
     end
   end
 end
diff --git a/app/controllers/partners/requests_controller.rb b/app/controllers/partners/requests_controller.rb
index 0c8d00a278..2e6964dc6f 100644
--- a/app/controllers/partners/requests_controller.rb
+++ b/app/controllers/partners/requests_controller.rb
@@ -8,10 +8,10 @@ def index
     end
 
     def new
-      @partner_request = Partners::Request.new
+      @partner_request = ::Request.new
       @partner_request.item_requests.build
 
-      requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.partner.id).call
+      requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.id).call
       @formatted_requestable_items = requestable_items.map do |rt|
         [rt.name, rt.id]
       end.sort
@@ -36,7 +36,7 @@ def create
 
         @partner_request = create_service.partner_request
         @errors = create_service.errors
-        @formatted_requestable_items = Organization.find(current_partner.essentials_bank_id).valid_items.map do |item|
+        @formatted_requestable_items = Organization.find(current_partner.organization_id).valid_items.map do |item|
           [item[:name], item[:id]]
         end.sort
 
@@ -49,11 +49,11 @@ def create
     private
 
     def partner_request_params
-      params.require(:partners_request).permit(:comments, item_requests_attributes: [
-                                                 :item_id,
+      params.require(:request).permit(:comments, item_requests_attributes: [
+                                        :item_id,
                                                  :quantity,
                                                  :_destroy
-                                               ])
+                                      ])
     end
   end
 end
diff --git a/app/controllers/partners_controller.rb b/app/controllers/partners_controller.rb
index e62180721c..ed3a5523f2 100644
--- a/app/controllers/partners_controller.rb
+++ b/app/controllers/partners_controller.rb
@@ -50,10 +50,10 @@ def approve_application
 
   def show
     @partner = current_organization.partners.find(params[:id])
-    @impact_metrics = @partner.profile.impact_metrics unless @partner.uninvited?
+    @impact_metrics = @partner.impact_metrics unless @partner.uninvited?
     @partner_distributions = @partner.distributions.includes(:partner, :storage_location, line_items: [:item]).order("issued_at DESC")
     @partner_profile_fields = current_organization.partner_form_fields
-    @partner_users = @partner.profile.users.order(name: :asc)
+    @partner_users = @partner.users.order(name: :asc)
 
     respond_to do |format|
       format.html
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index f751b491dd..d146e5cc87 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -1,12 +1,12 @@
 class ProfilesController < ApplicationController
   def edit
-    @partner = current_organization.partners.find(params[:id]).profile
+    @partner = current_organization.partners.find(params[:id])
   end
 
   def update
-    @partner = current_organization.partners.find(params[:id]).profile
-    if @partner.update(edit_profile_params)
-      redirect_to partner_path(@partner.partner) + "#partner-information", notice: "#{@partner.name} updated!"
+    @partner = current_organization.partners.find(params[:id])
+    if @partner.update(edit_partner_params) && @partner.profile.update(edit_profile_params)
+      redirect_to partner_path(@partner) + "#partner-information", notice: "#{@partner.name} updated!"
     else
       flash[:error] = "Something didn't work quite right -- try again?"
       render action: :edit
@@ -15,12 +15,14 @@ def update
 
   private
 
+  def edit_partner_params
+    params.require(:partner).permit(:name)
+  end
+
   def edit_profile_params
-    params.require(:partners_partner).permit(
-      :name,
+    params.require(:profile).permit(
       :agency_type,
       :other_agency_type,
-      :partner_status,
       :proof_of_partner_status,
       :agency_mission,
       :address1,
@@ -99,6 +101,6 @@ def edit_profile_params
       :enable_individual_requests,
       :enable_quantity_based_requests,
       documents: []
-    )
+    ).select { |_, v| v.present? }
   end
 end
diff --git a/app/helpers/partners_helper.rb b/app/helpers/partners_helper.rb
index bec35c6770..8166cd4457 100644
--- a/app/helpers/partners_helper.rb
+++ b/app/helpers/partners_helper.rb
@@ -13,12 +13,12 @@ def humanize_boolean(boolean)
   end
 
   def partner_status_badge(partner)
-    if partner.partner_status == "verified"
-      tag.span partner.partner_status, class: %w(badge badge-pill badge-primary float-right)
-    elsif partner.partner_status == "recertification_required"
-      tag.span partner.partner_status, class: %w(badge badge-pill badge-danger float-right)
+    if partner.status == "approved"
+      tag.span partner.display_status, class: %w(badge badge-pill badge-primary float-right)
+    elsif partner.status == "recertification_required"
+      tag.span partner.display_status, class: %w(badge badge-pill badge-danger float-right)
     else
-      tag.span partner.partner_status, class: %w(badge badge-pill badge-info float-right)
+      tag.span partner.display_status, class: %w(badge badge-pill badge-info float-right)
     end
   end
 end
diff --git a/app/models/partner.rb b/app/models/partner.rb
index 15897ee10c..62c43154b2 100644
--- a/app/models/partner.rb
+++ b/app/models/partner.rb
@@ -17,6 +17,7 @@
 #
 
 class Partner < ApplicationRecord
+  resourcify
   require "csv"
 
   ALLOWED_MIME_TYPES = [
@@ -31,9 +32,14 @@ class Partner < ApplicationRecord
   belongs_to :partner_group, optional: true
   has_many :item_categories, through: :partner_group
   has_many :requestable_items, through: :item_categories, source: :items
+  has_one :profile, class_name: 'Partners::Profile', dependent: :destroy
 
   has_many :distributions, dependent: :destroy
-  has_many :requests, dependent: :destroy
+  has_many :requests, dependent: :destroy, class_name: '::Request'
+  has_many :users, through: :roles, class_name: '::User', dependent: :destroy
+  has_many :families, dependent: :destroy, class_name: 'Partners::Family'
+  has_many :children, through: :families, class_name: 'Partners::Child'
+  has_many :authorized_family_members, through: :families, class_name: 'Partners::AuthorizedFamilyMember'
 
   has_many_attached :documents
 
@@ -64,8 +70,60 @@ class Partner < ApplicationRecord
     where(status: status.to_sym)
   }
 
-  def deactivated?
-    status == 'deactivated'
+  AGENCY_TYPES = {
+    "CAREER" => "Career technical training",
+    "ABUSE" => "Child abuse resource center",
+    "CHURCH" => "Church outreach ministry",
+    "CDC" => "Community development corporation",
+    "HEALTH" => "Community health program",
+    "OUTREACH" => "Community outreach services",
+    "CRISIS" => "Crisis/Disaster services",
+    "DISAB" => "Developmental disabilities program",
+    "DOMV" => "Domestic violence shelter",
+    "CHILD" => "Early childhood services",
+    "EDU" => "Education program",
+    "FAMILY" => "Family resource center",
+    "FOOD" => "Food bank/pantry",
+    "GOVT" => "Government Agency/Affiliate",
+    "HEADSTART" => "Head Start/Early Head Start",
+    "HOMEVISIT" => "Home visits",
+    "HOMELESS" => "Homeless resource center",
+    "INFPAN" => "Infant/Child Pantry/Closet",
+    "PREG" => "Pregnancy resource center",
+    "REF" => "Refugee resource center",
+    "TREAT" => "Treatment clinic",
+    "WIC" => "Women, Infants and Children",
+    "OTHER" => "Other"
+  }.freeze
+
+  ALL_PARTIALS = %w[
+    media_information
+    agency_stability
+    organizational_capacity
+    sources_of_funding
+    population_served
+    executive_director
+    diaper_pick_up_person
+    agency_distribution_information
+    attached_documents
+  ].freeze
+
+  # @return [String]
+  def display_status
+    case status
+    when :awaiting_review
+      'Submitted'
+    when :uninvited
+      'Pending'
+    when :approved
+      'Verified'
+    else
+      status.titleize
+    end
+  end
+
+  def primary_user
+    users.order('created_at ASC').first
   end
 
   # @return [Boolean]
@@ -73,22 +131,7 @@ def deletable?
     uninvited? &&
       distributions.none? &&
       requests.none? &&
-      (profile.nil? || profile&.users&.none?)
-  end
-
-  #
-  # Returns the Partners::Partner record which is stored in
-  # the partnerbase DB and contains mostly profile data of
-  # the partner user.
-  def profile
-    @profile ||= ::Partners::Partner.find_by(partner_id: id)
-  end
-
-  #
-  # Returns the primary User record which is the
-  # first & main user associated to a partner agency.
-  def primary_partner_user
-    profile&.primary_user
+      users&.none?
   end
 
   # better to extract this outside of the model
@@ -154,6 +197,10 @@ def contact_person
     }
   end
 
+  def partials_to_show
+    organization.partner_form_fields.presence || ALL_PARTIALS
+  end
+
   def quantity_year_to_date
     distributions
       .includes(:line_items)
@@ -161,8 +208,33 @@ def quantity_year_to_date
       .references(:line_items).map(&:line_items).flatten.sum(&:quantity)
   end
 
+  def impact_metrics
+    {
+      families_served: families_served_count,
+      children_served: children_served_count,
+      family_zipcodes: family_zipcodes_count,
+      family_zipcodes_list: family_zipcodes_list
+    }
+  end
+
   private
 
+  def families_served_count
+    families.count
+  end
+
+  def children_served_count
+    children.count
+  end
+
+  def family_zipcodes_count
+    families.pluck(:guardian_zip_code).uniq.count
+  end
+
+  def family_zipcodes_list
+    families.pluck(:guardian_zip_code).uniq
+  end
+
   def correct_document_mime_type
     if documents.attached? && documents.any? { |doc| !doc.content_type.in?(ALLOWED_MIME_TYPES) }
       errors.add(:documents, "Must be a PDF or DOC file")
@@ -170,7 +242,7 @@ def correct_document_mime_type
   end
 
   def invite_new_partner
-    UserInviteService.invite(email: email, roles: [Role::PARTNER], resource: profile)
+    UserInviteService.invite(email: email, roles: [Role::PARTNER], resource: self)
   end
 
   def should_invite_because_email_changed?
diff --git a/app/models/partners/family.rb b/app/models/partners/family.rb
index 498e24f617..c7ad7dae93 100644
--- a/app/models/partners/family.rb
+++ b/app/models/partners/family.rb
@@ -21,11 +21,12 @@
 #  sources_of_income         :jsonb
 #  created_at                :datetime         not null
 #  updated_at                :datetime         not null
+#  old_partner_id            :bigint
 #  partner_id                :bigint
 #
 module Partners
   class Family < Base
-    belongs_to :partner, class_name: "Partners::Partner"
+    belongs_to :partner, class_name: '::Partner'
     has_many :children, dependent: :destroy
     has_many :authorized_family_members, dependent: :destroy
     serialize :sources_of_income, Array
diff --git a/app/models/partners/item_request.rb b/app/models/partners/item_request.rb
index bf74e3b788..c996bc8936 100644
--- a/app/models/partners/item_request.rb
+++ b/app/models/partners/item_request.rb
@@ -2,18 +2,19 @@
 #
 # Table name: item_requests
 #
-#  id                 :bigint           not null, primary key
-#  name               :string
-#  partner_key        :string
-#  quantity           :string
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  item_id            :integer
-#  partner_request_id :bigint
+#  id                     :bigint           not null, primary key
+#  name                   :string
+#  partner_key            :string
+#  quantity               :string
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  item_id                :integer
+#  old_partner_request_id :integer
+#  partner_request_id     :bigint
 #
 module Partners
   class ItemRequest < Base
-    belongs_to :request, class_name: 'Partners::Request', foreign_key: :partner_request_id, inverse_of: :item_requests
+    belongs_to :request, class_name: '::Request', foreign_key: :partner_request_id, inverse_of: :item_requests
     has_many :child_item_requests, dependent: :destroy
     has_many :children, through: :child_item_requests
 
diff --git a/app/models/partners/partner_form.rb b/app/models/partners/partner_form.rb
deleted file mode 100644
index b1c9597e60..0000000000
--- a/app/models/partners/partner_form.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# == Schema Information
-#
-# Table name: partner_forms
-#
-#  id                 :bigint           not null, primary key
-#  sections           :text             default([]), is an Array
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  essentials_bank_id :integer
-#
-module Partners
-  class PartnerForm < Base
-    has_one :partner, primary_key: :essentials_bank_id, foreign_key: :essentials_bank_id, dependent: :destroy, inverse_of: :partner_form
-    validates :essentials_bank_id, presence: true, uniqueness: true
-  end
-end
diff --git a/app/models/partners/partner.rb b/app/models/partners/profile.rb
similarity index 59%
rename from app/models/partners/partner.rb
rename to app/models/partners/profile.rb
index c91040c68c..33a8851abd 100644
--- a/app/models/partners/partner.rb
+++ b/app/models/partners/profile.rb
@@ -80,16 +80,10 @@
 #  partner_id                     :integer
 #
 module Partners
-  class Partner < Base
+  class Profile < Base
     self.table_name = "partner_profiles"
-    resourcify
-
-    has_many :users, through: :roles, class_name: '::User', dependent: :destroy
-    has_many :requests, dependent: :destroy
-    has_many :families, dependent: :destroy
-    has_many :children, through: :families
-    has_many :authorized_family_members, through: :families
-    has_one :partner_form, primary_key: :essentials_bank_id, foreign_key: :essentials_bank_id, dependent: :destroy, inverse_of: :partner
+    belongs_to :partner
+    has_one :organization, through: :partner, class_name: "::Organization"
 
     has_one_attached :proof_of_partner_status
     has_one_attached :proof_of_form_990
@@ -111,101 +105,8 @@ class Partner < Base
       ages_served
     ]
 
-    VERIFIED_STATUS = 'verified'.freeze
-    RECERTIFICATION_REQUESTED_STATUS = 'recertification_required'.freeze
-    DEACTIVATED_STATUS = "deactivated".freeze
-
-    AGENCY_TYPES = {
-      "CAREER" => "Career technical training",
-      "ABUSE" => "Child abuse resource center",
-      "CHURCH" => "Church outreach ministry",
-      "CDC" => "Community development corporation",
-      "HEALTH" => "Community health program",
-      "OUTREACH" => "Community outreach services",
-      "CRISIS" => "Crisis/Disaster services",
-      "DISAB" => "Developmental disabilities program",
-      "DOMV" => "Domestic violence shelter",
-      "CHILD" => "Early childhood services",
-      "EDU" => "Education program",
-      "FAMILY" => "Family resource center",
-      "FOOD" => "Food bank/pantry",
-      "GOVT" => "Government Agency/Affiliate",
-      "HEADSTART" => "Head Start/Early Head Start",
-      "HOMEVISIT" => "Home visits",
-      "HOMELESS" => "Homeless resource center",
-      "INFPAN" => "Infant/Child Pantry/Closet",
-      "PREG" => "Pregnancy resource center",
-      "REF" => "Refugee resource center",
-      "TREAT" => "Treatment clinic",
-      "WIC" => "Women, Infants and Children",
-      "OTHER" => "Other"
-    }.freeze
-
-    ALL_PARTIALS = %w[
-      media_information
-      agency_stability
-      organizational_capacity
-      sources_of_funding
-      population_served
-      executive_director
-      diaper_pick_up_person
-      agency_distribution_information
-      attached_documents
-    ].freeze
-
-    def primary_user
-      users.order('created_at ASC').first
-    end
-
-    def verified?
-      partner_status == VERIFIED_STATUS
-    end
-
-    def deactivated?
-      status_in_diaper_base == DEACTIVATED_STATUS
-    end
-
-    def organization
-      Organization.find_by!(id: essentials_bank_id)
-    end
-
-    def partner
-      ::Partner.find_by!(id: partner_id)
-    end
-
-    def partials_to_show
-      partner_form&.sections || ALL_PARTIALS
-    end
-
-    def impact_metrics
-      {
-        families_served: families_served_count,
-        children_served: children_served_count,
-        family_zipcodes: family_zipcodes_count,
-        family_zipcodes_list: family_zipcodes_list
-      }
-    end
-
-    private
-
     def has_no_social_media?
       website.blank? && twitter.blank? && facebook.blank? && instagram.blank?
     end
-
-    def families_served_count
-      families.count
-    end
-
-    def children_served_count
-      children.count
-    end
-
-    def family_zipcodes_count
-      families.pluck(:guardian_zip_code).uniq.count
-    end
-
-    def family_zipcodes_list
-      families.pluck(:guardian_zip_code).uniq
-    end
   end
 end
diff --git a/app/models/partners/request.rb b/app/models/partners/request.rb
deleted file mode 100644
index d27bd6db0f..0000000000
--- a/app/models/partners/request.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# == Schema Information
-#
-# Table name: partner_requests
-#
-#  id              :bigint           not null, primary key
-#  comments        :text
-#  for_families    :boolean
-#  sent            :boolean          default(FALSE), not null
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  organization_id :bigint
-#  partner_id      :bigint
-#  partner_user_id :integer
-#
-module Partners
-  class Request < Base
-    self.table_name = "partner_requests"
-
-    belongs_to :partner, class_name: "Partners::Partner", dependent: :destroy
-    belongs_to :partner_user, class_name: "::User", optional: true
-
-    has_many :item_requests, class_name: 'Partners::ItemRequest', foreign_key: :partner_request_id, dependent: :destroy, inverse_of: :request
-    accepts_nested_attributes_for :item_requests, allow_destroy: true, reject_if: proc { |attributes| attributes["quantity"].blank? }
-    has_many :child_item_requests, through: :item_requests
-
-    validates :partner, presence: true
-    validates :partner_user, presence: true, on: :create
-    validates_associated :item_requests
-  end
-end
diff --git a/app/models/request.rb b/app/models/request.rb
index 5fc89e60a6..7af47c1fc1 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -25,6 +25,10 @@ class Request < ApplicationRecord
   belongs_to :organization
   belongs_to :distribution, optional: true
 
+  has_many :item_requests, class_name: "Partners::ItemRequest", foreign_key: :partner_request_id, dependent: :destroy, inverse_of: :request
+  accepts_nested_attributes_for :item_requests, allow_destroy: true, reject_if: proc { |attributes| attributes["quantity"].blank? }
+  has_many :child_item_requests, through: :item_requests
+
   enum status: { pending: 0, started: 1, fulfilled: 2, discarded: 3 }, _prefix: true
 
   validates :distribution_id, uniqueness: true, allow_nil: true
diff --git a/app/models/role.rb b/app/models/role.rb
index ae2a7e4980..95faf041ed 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -2,12 +2,13 @@
 #
 # Table name: roles
 #
-#  id            :bigint           not null, primary key
-#  name          :string
-#  resource_type :string
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
-#  resource_id   :bigint
+#  id              :bigint           not null, primary key
+#  name            :string
+#  resource_type   :string
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  old_resource_id :bigint
+#  resource_id     :bigint
 #
 class Role < ApplicationRecord
   has_and_belongs_to_many :users, join_table: :users_roles
diff --git a/app/models/user.rb b/app/models/user.rb
index 1ffbb0256a..91af7c0168 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -45,8 +45,8 @@ class User < ApplicationRecord
 
   has_one :partner_role_join, class_name: "UsersRole", dependent: :destroy
   has_one :partner_role, through: :partner_role_join, class_name: "Role", source: :role
-  has_one :partner, through: :partner_role, source: :resource, source_type: "Partners::Partner"
-  has_many :partners, through: :roles, source: :resource, source_type: "Partners::Partner"
+  has_one :partner, through: :partner_role, source: :resource, source_type: "Partner"
+  has_many :partners, through: :roles, source: :resource, source_type: "Partner"
 
   attr_accessor :organization_admin # for creation / update time
 
@@ -65,8 +65,7 @@ class User < ApplicationRecord
   scope :partner_users, -> { with_role(Role::PARTNER, :any) }
   scope :org_users, -> { with_role(Role::ORG_USER, :any) }
 
-  has_many :requests, class_name: "Partners::Request", foreign_key: :partner_id, dependent: :destroy, inverse_of: :partner_user
-  has_many :submitted_partner_requests, class_name: "Partners::Request", foreign_key: :partner_user_id, dependent: :destroy, inverse_of: :partner_user
+  has_many :requests, class_name: "::Request", foreign_key: :partner_id, dependent: :destroy, inverse_of: :partner_user
   has_many :submitted_requests, class_name: "Request", foreign_key: :partner_user_id, dependent: :destroy, inverse_of: :partner_user
 
   def password_complexity
diff --git a/app/services/organization_update_service.rb b/app/services/organization_update_service.rb
index ce9b144910..3ad4902f30 100644
--- a/app/services/organization_update_service.rb
+++ b/app/services/organization_update_service.rb
@@ -6,19 +6,10 @@ def self.update(organization, params)
     result = organization.update(params)
     return false unless result
 
-    sync_visible_partner_form_sections(organization)
     update_partner_flags(organization)
     true
   end
 
-  # @param organization [Organization]
-  def self.sync_visible_partner_form_sections(organization)
-    return unless organization.saved_change_to_attribute?(:partner_form_fields)
-
-    partner_form = Partners::PartnerForm.where(essentials_bank_id: organization.id).first_or_create
-    partner_form.update!(sections: organization.partner_form_fields)
-  end
-
   # @param organization [Organization]
   def self.update_partner_flags(organization)
     fields = %i[
diff --git a/app/services/partner_approval_service.rb b/app/services/partner_approval_service.rb
index 2c53432f14..30dcf0e6c3 100644
--- a/app/services/partner_approval_service.rb
+++ b/app/services/partner_approval_service.rb
@@ -9,7 +9,6 @@ def call
     return self unless valid?
 
     Partners::Base.transaction do
-      partner.profile.update!(partner_status: approved_partner_status)
       partner.approved!
 
       PartnerMailer.application_approved(partner: partner).deliver_later
@@ -32,8 +31,4 @@ def valid?
 
     errors.none?
   end
-
-  def approved_partner_status
-    Partners::Partner::VERIFIED_STATUS
-  end
 end
diff --git a/app/services/partner_create_service.rb b/app/services/partner_create_service.rb
index 13a91a8815..0028155e32 100644
--- a/app/services/partner_create_service.rb
+++ b/app/services/partner_create_service.rb
@@ -20,8 +20,7 @@ def call
     ActiveRecord::Base.transaction do
       @partner.save!
 
-      Partners::Partner.create!({
-                                  essentials_bank_id: organization.id,
+      Partners::Profile.create!({
                                   partner_id: @partner.id,
                                   name: @partner.name,
                                   enable_child_based_requests: organization.enable_child_based_requests,
diff --git a/app/services/partner_deactivate_service.rb b/app/services/partner_deactivate_service.rb
index cb7d04ce9d..b83429fb5b 100644
--- a/app/services/partner_deactivate_service.rb
+++ b/app/services/partner_deactivate_service.rb
@@ -9,10 +9,7 @@ def initialize(partner:)
 
   def call
     ActiveRecord::Base.transaction do
-      partners_partner = Partners::Partner.find_by!(partner_id: partner.id)
-
       partner.update!(status: 'deactivated')
-      partners_partner.update!(status_in_diaper_base: 'deactivated', partner_status: 'pending')
     rescue StandardError => e
       errors.add(:base, e.message)
       raise ActiveRecord::Rollback
diff --git a/app/services/partner_invite_service.rb b/app/services/partner_invite_service.rb
index fedef441ee..bf5cb06ef9 100644
--- a/app/services/partner_invite_service.rb
+++ b/app/services/partner_invite_service.rb
@@ -15,7 +15,7 @@ def call
     partner.update!(status: 'invited')
     UserInviteService.invite(email: partner.email,
       roles: [Role::PARTNER],
-      resource: partner.profile)
+      resource: partner)
   end
 
   attr_reader :partner
diff --git a/app/services/partner_reactivate_service.rb b/app/services/partner_reactivate_service.rb
index 9e6b05d644..688b9d42f0 100644
--- a/app/services/partner_reactivate_service.rb
+++ b/app/services/partner_reactivate_service.rb
@@ -9,10 +9,7 @@ def initialize(partner:)
 
   def call
     ActiveRecord::Base.transaction do
-      partners_partner = Partners::Partner.find_by!(partner_id: partner.id)
-
       partner.update!(status: 'approved')
-      partners_partner.update!(status_in_diaper_base: 'approved', partner_status: 'verified')
     rescue StandardError => e
       errors.add(:base, e.message)
       raise ActiveRecord::Rollback
diff --git a/app/services/partner_request_recertification_service.rb b/app/services/partner_request_recertification_service.rb
index 9f6dd27400..ab6b2000cb 100644
--- a/app/services/partner_request_recertification_service.rb
+++ b/app/services/partner_request_recertification_service.rb
@@ -14,7 +14,6 @@ def call
     return self unless valid?
 
     Partners::Base.transaction do
-      partner.profile.update!(partner_status: Partners::Partner::RECERTIFICATION_REQUESTED_STATUS)
       partner.recertification_required!
       PartnerMailer.recertification_request(partner: partner).deliver_later
     rescue StandardError => e
diff --git a/app/services/partners/family_request_create_service.rb b/app/services/partners/family_request_create_service.rb
index 9af41d4a69..0099c56d8b 100644
--- a/app/services/partners/family_request_create_service.rb
+++ b/app/services/partners/family_request_create_service.rb
@@ -1,7 +1,6 @@
 # This service object is meant to transform a family request
 # into the correct parameters that would be expected a regular
-# Partners::ItemRequest. It will create the relevant
-# organization request (i.e. ::Request), the Partners::Request,
+# Partners::ItemRequest. It will create the relevant Request,
 # the Partners::ItemRequest(s), and Partners::ChildItemRequest(s)
 module Partners
   class FamilyRequestCreateService
diff --git a/app/services/partners/request_approval_service.rb b/app/services/partners/request_approval_service.rb
index d0d95a9464..d4b3857e81 100644
--- a/app/services/partners/request_approval_service.rb
+++ b/app/services/partners/request_approval_service.rb
@@ -14,7 +14,6 @@ def initialize(partner:)
     def call
       return self unless valid?
 
-      partner.profile.update(partner_status: 'submitted')
       partner.awaiting_review!
 
       OrganizationMailer.partner_approval_request(organization: partner.organization, partner: partner).deliver_later
@@ -26,7 +25,7 @@ def call
     attr_reader :partner
 
     def valid?
-      if partner.profile.partner_status == 'submitted'
+      if partner.status == 'awaiting_review'
         errors.add(:base, 'partner has already requested approval')
       end
 
diff --git a/app/services/partners/request_create_service.rb b/app/services/partners/request_create_service.rb
index 71e356ebcd..e5c4058083 100644
--- a/app/services/partners/request_create_service.rb
+++ b/app/services/partners/request_create_service.rb
@@ -13,7 +13,10 @@ def initialize(partner_user_id:, comments: nil, for_families: false, item_reques
     end
 
     def call
-      @partner_request = Partners::Request.new(partner_id: partner.id, organization_id: organization_id, comments: comments, for_families: @for_families, sent: true, partner_user_id: partner_user_id)
+      @partner_request = ::Request.new(partner_id: partner.id,
+        organization_id: organization_id,
+        comments: comments,
+        partner_user_id: partner_user_id)
       @partner_request = populate_item_request(@partner_request)
       @partner_request.assign_attributes(additional_attrs)
 
@@ -29,13 +32,10 @@ def call
 
       return self if errors.present?
 
-      Partners::Base.transaction do
+      Request.transaction do
         @partner_request.save!
 
-        @organization_request = build_organization_request(@partner_request)
-        @organization_request.save!
-
-        NotifyPartnerJob.perform_now(@organization_request.id)
+        NotifyPartnerJob.perform_now(@partner_request.id)
       rescue StandardError => e
         errors.add(:base, e.message)
         raise ActiveRecord::Rollback
@@ -66,6 +66,12 @@ def populate_item_request(partner_request)
 
       partner_request.item_requests << item_requests
 
+      partner_request.request_items = partner_request.item_requests.map do |ir|
+        {
+          item_id: ir.item_id,
+          quantity: ir.quantity
+        }
+      end
       partner_request
     end
 
@@ -88,26 +94,11 @@ def organization_item_data
     end
 
     def organization_id
-      @organization_id ||= partner.essentials_bank_id
+      @organization_id ||= partner.organization_id
     end
 
     def partner
       @partner ||= ::User.find(partner_user_id).partner
     end
-
-    def build_organization_request(partner_request)
-      ::Request.new(
-        organization_id: partner_request.organization_id,
-        partner_id: partner_request.partner.partner_id,
-        partner_user_id: partner_user_id,
-        comments: partner_request.comments,
-        request_items: partner_request.item_requests.map do |ir|
-          {
-            item_id: ir.item_id,
-            quantity: ir.quantity
-          }
-        end
-      )
-    end
   end
 end
diff --git a/app/services/reports/partner_info_report_service.rb b/app/services/reports/partner_info_report_service.rb
index 4d504fcf82..ced0ebb1fb 100644
--- a/app/services/reports/partner_info_report_service.rb
+++ b/app/services/reports/partner_info_report_service.rb
@@ -22,7 +22,7 @@ def report
       @report = { name: 'Partner Agencies and Service Area', entries: entries }
     end
 
-    # @return [Array<Partners::Partner>]
+    # @return [Array<Partner>]
     def partner_agency_profiles
       @partner_agency_profiles ||= organization.partners.map(&:profile).compact
     end
diff --git a/app/views/layouts/partners/navigation/_navbar.html.erb b/app/views/layouts/partners/navigation/_navbar.html.erb
index 12c7cf9211..3712f3e58f 100644
--- a/app/views/layouts/partners/navigation/_navbar.html.erb
+++ b/app/views/layouts/partners/navigation/_navbar.html.erb
@@ -21,7 +21,7 @@
     <div class="dropdown-divider"></div>
     <% current_user.switchable_roles.each do |role| %>
       <% next if role == current_role %>
-      <%= link_to switch_to_role_users_path(role_id: role.id), class:"dropdown-item" do %>
+      <%= link_to switch_to_role_users_path(organization_id: current_partner.organization_id, role_id: role.id), class:"dropdown-item" do %>
         <i class="fa fa-repeat text-aqua"></i><%= "Switch to: #{role.resource.name}" %>
       <% end %>
     <% end %>
diff --git a/app/views/layouts/partners/navigation/_sidebar.html.erb b/app/views/layouts/partners/navigation/_sidebar.html.erb
index 22754a08ab..44d31e62ea 100644
--- a/app/views/layouts/partners/navigation/_sidebar.html.erb
+++ b/app/views/layouts/partners/navigation/_sidebar.html.erb
@@ -37,7 +37,7 @@
 
 
 
-  <% if current_partner.enable_child_based_requests? %>
+  <% if current_partner.profile.enable_child_based_requests? %>
     <li class="nav-item">
       <%= link_to(partners_families_path, class: "nav-link") do %>
         <i class="nav-icon fa fa-users"></i>
diff --git a/app/views/partners/dashboards/show.html.erb b/app/views/partners/dashboards/show.html.erb
index de747e05bb..18bcc317da 100644
--- a/app/views/partners/dashboards/show.html.erb
+++ b/app/views/partners/dashboards/show.html.erb
@@ -1,11 +1,11 @@
 <header class="container mx-auto mb-5">
   <h1 class="d-block font-weight-bold mb-1">Dashboard - <%= @partner.name %></h1>
   <h3><button class="btn btn-warning mx-auto p-2 font-weight-bold round">
-  <%= @partner.partner_status.titleize %> Partner</button></h3>
+  <%= @partner.display_status %> Partner</button></h3>
 </header>
 
 <main>
-  <%= render partial: '/partners/requests/request_options_card' if @partner.verified? %>
+  <%= render partial: '/partners/requests/request_options_card' if @partner.approved? %>
 
   <section class="container mx-auto my-5">
     <%= render partial: "requests_in_progress" %>
diff --git a/app/views/partners/distributions/index.html.erb b/app/views/partners/distributions/index.html.erb
index 5bc52d7b9c..8821002bc5 100644
--- a/app/views/partners/distributions/index.html.erb
+++ b/app/views/partners/distributions/index.html.erb
@@ -1,7 +1,7 @@
 <header class="container mx-auto mb-8">
   <h1 class="block font-bold mb-1">Dashboard - <%= @partner.name %></h1>
   <h3><button class="bg-yellow-400 mx-auto p-2 font-bold rounded-2xl">
-    <%= @partner.partner_status.titleize %> Partner</button></h3>
+    <%= @partner.display_status %> Partner</button></h3>
 </header>
 
 <main>
@@ -12,4 +12,4 @@
              date_header: "Distribution date",
              item_header: "Items"}%>
   </section>
-</main>
\ No newline at end of file
+</main>
diff --git a/app/views/partners/profiles/edit.html.erb b/app/views/partners/profiles/edit.html.erb
index 1339498f50..479351ef72 100644
--- a/app/views/partners/profiles/edit.html.erb
+++ b/app/views/partners/profiles/edit.html.erb
@@ -28,23 +28,25 @@
         <!-- jquery validation -->
         <div class="card-transparent">
           <%= simple_form_for current_partner, url: partners_profile_path, html: {role: 'form', class: 'form-horizontal'} do |form| %>
-            <div class="row">
-              <div class="col-6">
-                <%= render partial: "partners/profiles/edit/agency_information", locals: {form: form, partner: current_partner} %>
-              </div>
-              <% current_partner.partials_to_show.each do |partial| %>
+            <%= simple_fields_for :profile, current_partner.profile do |profile_form| %>
+              <div class="row">
+                <div class="col-6">
+                  <%= render partial: "partners/profiles/edit/agency_information", locals: {form: form, profile: current_partner.profile, profile_form: profile_form} %>
+                </div>
+                <% current_partner.partials_to_show.each do |partial| %>
+                  <div class="col-6">
+                    <%= render partial: "partners/profiles/edit/#{partial}", locals: {form: profile_form, profile: current_partner.profile} %>
+                  </div>
+                <% end %>
                 <div class="col-6">
-                  <%= render partial: "partners/profiles/edit/#{partial}", locals: {form: form, partner: current_partner} %>
+                  <%= render partial: "partners/profiles/edit/partner_settings", locals: {form: profile_form, profile: current_partner.profile} %>
                 </div>
-              <% end %>
-              <div class="col-6">
-                <%= render partial: "partners/profiles/edit/partner_settings", locals: {form: form, partner: current_partner} %>
               </div>
-            </div>
-            <div class="card-footer">
-              <%= form.submit("Update Information", class: "btn btn-primary") %>
-              <%= link_to "Cancel Update", partners_profile_path, class: "btn btn-danger float-right" %>
-            </div>
+              <div class="card-footer">
+                <%= form.submit("Update Information", class: "btn btn-primary") %>
+                <%= link_to "Cancel Update", partners_profile_path, class: "btn btn-danger float-right" %>
+              </div>
+            <% end %>
           <% end %>
         </div>
       </div>
diff --git a/app/views/partners/profiles/edit/_agency_information.html.erb b/app/views/partners/profiles/edit/_agency_information.html.erb
index 215b591c24..de88003a3a 100644
--- a/app/views/partners/profiles/edit/_agency_information.html.erb
+++ b/app/views/partners/profiles/edit/_agency_information.html.erb
@@ -8,28 +8,28 @@
           </div>
           <div class="card-body">
             <%= form.input :name, label: "Agency Name", class: "form-control", wrapper: :input_group %>
-            <%= form.input :agency_type, collection: Partners::Partner::AGENCY_TYPES.values, label: "Agency Type", class: "form-control", wrapper: :input_group %>
-            <%= form.input :other_agency_type, label: "Other Agency Type", class: "form-control", wrapper: :input_group %>
+            <%= profile_form.input :agency_type, collection: Partner::AGENCY_TYPES.values, label: "Agency Type", class: "form-control", wrapper: :input_group %>
+            <%= profile_form.input :other_agency_type, label: "Other Agency Type", class: "form-control", wrapper: :input_group %>
             <div class="form-group row">
               <label class="control-label col-md-3">501(c)(3) IRS Determination Letter</label>
-              <% if partner.proof_of_partner_status.attached? %>
+              <% if profile.proof_of_partner_status.attached? %>
                 <div class="col-md-8">
                   Attached
-                  file: <%= link_to partner.proof_of_partner_status.blob['filename'], rails_blob_path(partner.proof_of_partner_status), class: "font-weight-bold" %>
-                  <%= form.file_field :proof_of_partner_status, class: "form-control-file form-control" %>
+                  file: <%= link_to profile.proof_of_partner_status.blob['filename'], rails_blob_path(profile.proof_of_partner_status), class: "font-weight-bold" %>
+                  <%= profile_form.file_field :proof_of_partner_status, class: "form-control-file form-control" %>
                 </div>
               <% else %>
                 <div class="col-md-8">
-                  <%= form.file_field :proof_of_partner_status, class: "form-control-file" %>
+                  <%= profile_form.file_field :proof_of_partner_status, class: "form-control-file" %>
                 </div>
               <% end %>
             </div>
-            <%= form.input :agency_mission, label: "Agency Mission", class: "form-control", wrapper: :input_group %>
-            <%= form.input :address1, label: "Address (line 1)", class: "form-control", wrapper: :input_group %>
-            <%= form.input :address2, label: "Address (line 2)", class: "form-control", wrapper: :input_group %>
-            <%= form.input :city, label: "City", class: "form-control", wrapper: :input_group %>
-            <%= form.input :state, label: "State", class: "form-control", wrapper: :input_group %>
-            <%= form.input :zip_code, label: "Zip Code", class: "form-control", wrapper: :input_group %>
+            <%= profile_form.input :agency_mission, label: "Agency Mission", class: "form-control", wrapper: :input_group %>
+            <%= profile_form.input :address1, label: "Address (line 1)", class: "form-control", wrapper: :input_group %>
+            <%= profile_form.input :address2, label: "Address (line 2)", class: "form-control", wrapper: :input_group %>
+            <%= profile_form.input :city, label: "City", class: "form-control", wrapper: :input_group %>
+            <%= profile_form.input :state, label: "State", class: "form-control", wrapper: :input_group %>
+            <%= profile_form.input :zip_code, label: "Zip Code", class: "form-control", wrapper: :input_group %>
           </div>
         </div>
       </div>
diff --git a/app/views/partners/profiles/edit/_agency_stability.html.erb b/app/views/partners/profiles/edit/_agency_stability.html.erb
index 9e88d102c2..4eb5c198ea 100644
--- a/app/views/partners/profiles/edit/_agency_stability.html.erb
+++ b/app/views/partners/profiles/edit/_agency_stability.html.erb
@@ -10,10 +10,10 @@
             <%= form.input :founded, label: "Year Founded", class: "form-control", wrapper: :input_group %>
             <%= form.input :form_990, label: "Form 990 Filed", as: :boolean, class: "form-control", wrapper: :input_group %>
             <label class="control-label col-md-3">Form 990</label>
-            <% if partner.proof_of_form_990.attached? %>
+            <% if profile.proof_of_form_990.attached? %>
               <div class="col-md-8">
                 Attached
-                file: <%= link_to partner.proof_of_form_990.blob['filename'], rails_blob_path(partner.proof_of_form_990), class: "font-weight-bold" %>
+                file: <%= link_to profile.proof_of_form_990.blob['filename'], rails_blob_path(profile.proof_of_form_990), class: "font-weight-bold" %>
                 <%= form.file_field :proof_of_form_990, class: "form-control-file form-control" %>
               </div>
             <% else %>
diff --git a/app/views/partners/profiles/edit/_attached_documents.html.erb b/app/views/partners/profiles/edit/_attached_documents.html.erb
index 34ee514c53..b7866a60ef 100644
--- a/app/views/partners/profiles/edit/_attached_documents.html.erb
+++ b/app/views/partners/profiles/edit/_attached_documents.html.erb
@@ -7,12 +7,12 @@
             <h3 class="card-title"><strong>Additional Documents</strong></h3>
           </div>
           <div class="card-body">
-            <% if partner.documents.attached? %>
+            <% if profile.documents.attached? %>
               <div class="row">
                 <div class="col-6">
                   Attached files:
                   <ul>
-                    <% partner.documents.each do |doc| %>
+                    <% profile.documents.each do |doc| %>
                       <li><%= link_to doc.blob['filename'], rails_blob_path(doc), class: "font-weight-bold" %></li>
                     <% end %>
                   </ul>
diff --git a/app/views/partners/profiles/show.html.erb b/app/views/partners/profiles/show.html.erb
index fdab17b9fe..fc4a1992e0 100644
--- a/app/views/partners/profiles/show.html.erb
+++ b/app/views/partners/profiles/show.html.erb
@@ -3,7 +3,7 @@
     <div class="row mb-2">
       <div class="col-sm-6">
         <% content_for :title, "My Organization - #{current_partner.name}" %>
-        <% if current_partner.partner_status == "recertification_required" %>
+        <% if current_partner.status == "recertification_required" %>
           <div class="alert alert-danger"><i class="fa fa-warning"></i>&nbsp;
             Please review your application details and submit for approval.</div>
         <% end %>
@@ -27,15 +27,15 @@
       <div class="container-fluid">
         <div class="row">
           <div class="col-6">
-            <%= render partial: "partners/profiles/show/agency_information", locals: { partner: current_partner } %>
+            <%= render partial: "partners/profiles/show/agency_information", locals: { profile: current_partner.profile } %>
           </div>
           <% current_partner.partials_to_show.each do |partial| %>
             <div class="col-6">
-              <%= render partial: "partners/profiles/show/#{partial}", locals: { partner: current_partner }%>
+              <%= render partial: "partners/profiles/show/#{partial}", locals: { profile: current_partner.profile }%>
             </div>
           <% end %>
           <div class="col-6">
-            <%= render partial: "partners/profiles/show/partner_settings", locals: { partner: current_partner }%>
+            <%= render partial: "partners/profiles/show/partner_settings", locals: { profile: current_partner.profile }%>
           </div>
         </div>
       </div>
@@ -50,11 +50,11 @@
         <!-- jquery validation -->
         <div class="card card-primary">
           <div class="card-footer">
-            <% if current_partner.verified? %>
+            <% if current_partner.approved? %>
               <%= link_to '', class: 'btn btn-info disabled' do %>
                 <i class="fa fa-check"></i> Approved
               <% end %>
-            <% elsif current_partner.partner_status == 'submitted' %>
+            <% elsif current_partner.awaiting_review? %>
               <%= link_to '', class: "btn btn-warning disabled" do %>
                 <i class="fa fa-clock"></i> Pending Approval
               <% end %>
diff --git a/app/views/partners/profiles/show/_agency_distribution_information.html.erb b/app/views/partners/profiles/show/_agency_distribution_information.html.erb
index 4e2c6fe294..76cfc3d778 100644
--- a/app/views/partners/profiles/show/_agency_distribution_information.html.erb
+++ b/app/views/partners/profiles/show/_agency_distribution_information.html.erb
@@ -3,13 +3,13 @@
   <div class="card-body">
     <dl>
       <dt>Distribution Times</dt>
-      <dd><%= partner.distribution_times %></dd>
+      <dd><%= profile.distribution_times %></dd>
 
       <dt>New Client Times</dt>
-      <dd><%= partner.new_client_times %></dd>
+      <dd><%= profile.new_client_times %></dd>
 
       <dt>More Docs Required</dt>
-      <dd><%= partner.more_docs_required %></dd>
+      <dd><%= profile.more_docs_required %></dd>
     </dl>
   </div>
 </div>
diff --git a/app/views/partners/profiles/show/_agency_information.html.erb b/app/views/partners/profiles/show/_agency_information.html.erb
index f01cf02513..a28c484b73 100644
--- a/app/views/partners/profiles/show/_agency_information.html.erb
+++ b/app/views/partners/profiles/show/_agency_information.html.erb
@@ -3,38 +3,38 @@
   <div class="card-body">
     <dl>
       <dt>Name</dt>
-      <dd><%= partner.name %></dd>
+      <dd><%= profile.partner.name %></dd>
 
       <dt>Agency Type</dt>
-      <dd><%= partner.agency_type %></dd>
+      <dd><%= profile.agency_type %></dd>
 
-      <% if partner.agency_type == "Other" %>
+      <% if profile.agency_type == "Other" %>
         <dt>Other Agency Type</dt>
-        <dd><%= partner.other_agency_type %></dd>
+        <dd><%= profile.other_agency_type %></dd>
       <% end %>
 
       <dt>Status</dt>
-      <dd><%= partner.partner_status.humanize %></dd>
+      <dd><%= profile.partner.display_status %></dd>
 
       <dt>501(c)(3) IRS Determination Letter</dt>
-      <% if partner.proof_of_partner_status.attached? %>
+      <% if profile.proof_of_partner_status.attached? %>
         <dd>Attached
-          file: <%= link_to partner.proof_of_partner_status.blob['filename'], rails_blob_path(partner.proof_of_partner_status), class: "font-weight-bold" %></dd>
+          file: <%= link_to profile.proof_of_partner_status.blob['filename'], rails_blob_path(profile.proof_of_partner_status), class: "font-weight-bold" %></dd>
       <% else %>
         <dd>Documentation not on file</dd>
       <% end %>
 
       <dt>Agency Mission</dt>
-      <dd><%= partner.agency_mission %></dd>
+      <dd><%= profile.agency_mission %></dd>
 
       <address>
         <strong>Address</strong> <br>
-        <%= partner.address1 %> <br>
-        <% unless partner.address2.blank? %> <br>
-          <%= partner.address2 %> <br>
+        <%= profile.address1 %> <br>
+        <% unless profile.address2.blank? %> <br>
+          <%= profile.address2 %> <br>
         <% end %>
-        <%= partner.city %> <%= partner.state %> <br>
-        <%= partner.zip_code %>
+        <%= profile.city %> <%= profile.state %> <br>
+        <%= profile.zip_code %>
       </address>
     </dl>
   </div>
diff --git a/app/views/partners/profiles/show/_agency_stability.html.erb b/app/views/partners/profiles/show/_agency_stability.html.erb
index 523156bbe4..6ffae8529e 100644
--- a/app/views/partners/profiles/show/_agency_stability.html.erb
+++ b/app/views/partners/profiles/show/_agency_stability.html.erb
@@ -3,51 +3,51 @@
   <div class="card-body">
     <dl>
       <dt>Year Founded</dt>
-      <dd><%= partner.founded %></dd>
+      <dd><%= profile.founded %></dd>
 
       <dt>Form 990 Filed</dt>
-      <dd><%= humanize_boolean(partner.form_990) %></dd>
+      <dd><%= humanize_boolean(profile.form_990) %></dd>
 
       <dt>Form 990</dt>
-      <% if partner.proof_of_form_990.attached? %>
+      <% if profile.proof_of_form_990.attached? %>
         <dd>Attached
-          file: <%= link_to partner.proof_of_form_990.blob['filename'], rails_blob_path(partner.proof_of_form_990), class: "font-weight-bold" %></dd>
+          file: <%= link_to profile.proof_of_form_990.blob['filename'], rails_blob_path(profile.proof_of_form_990), class: "font-weight-bold" %></dd>
       <% else %>
         <dd>Form 990 not on file</dd>
       <% end %>
 
       <dt>Program Name(s)</dt>
-      <dd><%= partner.program_name %></dd>
+      <dd><%= profile.program_name %></dd>
 
       <dt>Program Description(s)</dt>
-      <dd><%= partner.program_description %></dd>
+      <dd><%= profile.program_description %></dd>
 
       <dt>Agency Age</dt>
-      <dd><%= partner.program_age %></dd>
+      <dd><%= profile.program_age %></dd>
 
       <dt>Case Management</dt>
-      <dd><%= humanize_boolean(partner.case_management) %></dd>
+      <dd><%= humanize_boolean(profile.case_management) %></dd>
 
       <dt>Evidence Based</dt>
-      <dd><%= humanize_boolean(partner.evidence_based) %></dd>
+      <dd><%= humanize_boolean(profile.evidence_based) %></dd>
 
       <dt>How Are Essentials (e.g. diapers, period supplies) Used In Your Program?</dt>
-      <dd><%= partner.essentials_use %></dd>
+      <dd><%= profile.essentials_use %></dd>
 
       <dt>Do You Receive Essentials From Other Sources?</dt>
-      <dd><%= partner.receives_essentials_from_other %></dd>
+      <dd><%= profile.receives_essentials_from_other %></dd>
 
       <dt>Current Providing Diapers</dt>
-      <dd><%= humanize_boolean(partner.currently_provide_diapers) %></dd>
+      <dd><%= humanize_boolean(profile.currently_provide_diapers) %></dd>
 
       <address>
         <strong>Program Address (if different)</strong> <br>
-        <%= partner.program_address1 %> <br>
-        <% unless partner.program_address2.blank? %>
-          <%= partner.program_address2 %> <br>
+        <%= profile.program_address1 %> <br>
+        <% unless profile.program_address2.blank? %>
+          <%= profile.program_address2 %> <br>
         <% end %>
-        <%= partner.program_city %> <%= partner.program_state %> <br>
-        <%= partner.program_zip_code %>
+        <%= profile.program_city %> <%= profile.program_state %> <br>
+        <%= profile.program_zip_code %>
       </address>
     </dl>
   </div>
diff --git a/app/views/partners/profiles/show/_attached_documents.html.erb b/app/views/partners/profiles/show/_attached_documents.html.erb
index d876b34673..61559bbf81 100644
--- a/app/views/partners/profiles/show/_attached_documents.html.erb
+++ b/app/views/partners/profiles/show/_attached_documents.html.erb
@@ -1,9 +1,9 @@
 <div class="card mb-4">
   <h5 class="card-header bg-primary text-white">Attached Documents</h5>
   <div class="card-body">
-    <% if partner.documents.attached? %>
+    <% if profile.documents.attached? %>
       <dt>Attached files:</dt>
-      <% partner.documents.each do |doc| %>
+      <% profile.documents.each do |doc| %>
         <dd><%= link_to doc.blob['filename'], rails_blob_path(doc), class: "font-weight-bold" %></dd>
       <% end %>
     <% else %>
diff --git a/app/views/partners/profiles/show/_diaper_pick_up_person.html.erb b/app/views/partners/profiles/show/_diaper_pick_up_person.html.erb
index dd51e94d25..00b0f801f1 100644
--- a/app/views/partners/profiles/show/_diaper_pick_up_person.html.erb
+++ b/app/views/partners/profiles/show/_diaper_pick_up_person.html.erb
@@ -3,13 +3,13 @@
   <div class="card-body">
     <dl>
       <dt>Name</dt>
-      <dd><%= partner.pick_up_name %></dd>
+      <dd><%= profile.pick_up_name %></dd>
 
       <dt>Phone</dt>
-      <dd><%= partner.pick_up_phone %></dd>
+      <dd><%= profile.pick_up_phone %></dd>
 
       <dt>Email</dt>
-      <dd><%= partner.pick_up_email %></dd>
+      <dd><%= profile.pick_up_email %></dd>
     </dl>
   </div>
 </div>
diff --git a/app/views/partners/profiles/show/_executive_director.html.erb b/app/views/partners/profiles/show/_executive_director.html.erb
index 968a6f1623..d8c34b3a29 100644
--- a/app/views/partners/profiles/show/_executive_director.html.erb
+++ b/app/views/partners/profiles/show/_executive_director.html.erb
@@ -3,28 +3,28 @@
   <div class="card-body">
     <dl>
       <dt>Name</dt>
-      <dd><%= partner.executive_director_name %></dd>
+      <dd><%= profile.executive_director_name %></dd>
 
       <dt>Phone Number</dt>
-      <dd><%= partner.executive_director_phone %></dd>
+      <dd><%= profile.executive_director_phone %></dd>
 
       <dt>Email</dt>
-      <dd><%= partner.executive_director_email %></dd>
+      <dd><%= profile.executive_director_email %></dd>
     </dl>
 
     <h6>Primary Contact Person</h6>
     <dl>
       <dt>Name</dt>
-      <dd><%= partner.primary_contact_name %></dd>
+      <dd><%= profile.primary_contact_name %></dd>
 
       <dt>Phone Number</dt>
-      <dd><%= partner.primary_contact_phone %></dd>
+      <dd><%= profile.primary_contact_phone %></dd>
 
       <dt>Mobile Phone Number</dt>
-      <dd><%= partner.primary_contact_mobile %></dd>
+      <dd><%= profile.primary_contact_mobile %></dd>
 
       <dt>Email</dt>
-      <dd><%= partner.primary_contact_email %></dd>
+      <dd><%= profile.primary_contact_email %></dd>
     </dl>
   </div>
 </div>
diff --git a/app/views/partners/profiles/show/_media_information.html.erb b/app/views/partners/profiles/show/_media_information.html.erb
index 4d9bee8f50..33eb41f691 100644
--- a/app/views/partners/profiles/show/_media_information.html.erb
+++ b/app/views/partners/profiles/show/_media_information.html.erb
@@ -3,19 +3,19 @@
   <div class="card-body">
     <dl>
       <dt>Website</dt>
-      <dd><%= partner.website %></dd>
+      <dd><%= profile.website %></dd>
 
       <dt>Facebook</dt>
-      <dd><%= partner.facebook %></dd>
+      <dd><%= profile.facebook %></dd>
 
       <dt>Twitter</dt>
-      <dd><%= partner.twitter %></dd>
+      <dd><%= profile.twitter %></dd>
 
       <dt>Instagram</dt>
-      <dd><%= partner.instagram %></dd>
+      <dd><%= profile.instagram %></dd>
 
       <dt>No Social Media Presence</dt>
-      <dd><%= humanize_boolean(partner.no_social_media_presence) %></dd>
+      <dd><%= humanize_boolean(profile.no_social_media_presence) %></dd>
     </dl>
   </div>
 </div>
diff --git a/app/views/partners/profiles/show/_organizational_capacity.html.erb b/app/views/partners/profiles/show/_organizational_capacity.html.erb
index 07138ed9e9..c0ba84123f 100644
--- a/app/views/partners/profiles/show/_organizational_capacity.html.erb
+++ b/app/views/partners/profiles/show/_organizational_capacity.html.erb
@@ -3,13 +3,13 @@
   <div class="card-body">
     <dl>
       <dt>Client Capacity</dt>
-      <dd><%= partner.client_capacity %></dd>
+      <dd><%= profile.client_capacity %></dd>
 
       <dt>Storage Space</dt>
-      <dd><%= humanize_boolean(partner.storage_space) %></dd>
+      <dd><%= humanize_boolean(profile.storage_space) %></dd>
 
       <dt>Storage Space Description</dt>
-      <dd><%= partner.describe_storage_space %></dd>
+      <dd><%= profile.describe_storage_space %></dd>
     </dl>
   </div>
 </div>
diff --git a/app/views/partners/profiles/show/_partner_settings.html.erb b/app/views/partners/profiles/show/_partner_settings.html.erb
index 35bf36a4f1..c7c1147d04 100644
--- a/app/views/partners/profiles/show/_partner_settings.html.erb
+++ b/app/views/partners/profiles/show/_partner_settings.html.erb
@@ -2,17 +2,17 @@
   <h5 class="text-white card-header bg-primary">Settings</h5>
   <div class="card-body">
     <dl>
-      <% if partner.organization.enable_quantity_based_requests? %>
+      <% if profile.organization.enable_quantity_based_requests? %>
         <dt>Uses Quantity Based Requests</dt>
-        <dd><%= humanize_boolean(partner.enable_quantity_based_requests) %></dd>
+        <dd><%= humanize_boolean(profile.enable_quantity_based_requests) %></dd>
       <% end %>
-      <% if partner.organization.enable_child_based_requests? %>
+      <% if profile.organization.enable_child_based_requests? %>
         <dt>Uses Child Based Requests</dt>
-        <dd><%= humanize_boolean(partner.enable_child_based_requests) %></dd>
+        <dd><%= humanize_boolean(profile.enable_child_based_requests) %></dd>
       <% end %>
-      <% if partner.organization.enable_individual_requests? %>
+      <% if profile.organization.enable_individual_requests? %>
         <dt>Uses Individual Requests</dt>
-        <dd><%= humanize_boolean(partner.enable_individual_requests) %></dd>
+        <dd><%= humanize_boolean(profile.enable_individual_requests) %></dd>
       <% end %>
     </dl>
   </div>
diff --git a/app/views/partners/profiles/show/_population_served.html.erb b/app/views/partners/profiles/show/_population_served.html.erb
index 919d0c8f09..006465be8c 100644
--- a/app/views/partners/profiles/show/_population_served.html.erb
+++ b/app/views/partners/profiles/show/_population_served.html.erb
@@ -3,51 +3,51 @@
   <div class="card-body">
     <dl>
       <dt>Clients Have An Income Requirement to Work With You</dt>
-      <dd><%= humanize_boolean(partner.income_requirement_desc) %></dd>
+      <dd><%= humanize_boolean(profile.income_requirement_desc) %></dd>
 
       <dt>Do You Verify The Income Of Your Clients</dt>
-      <dd><%= humanize_boolean(partner.income_verification) %></dd>
+      <dd><%= humanize_boolean(profile.income_verification) %></dd>
 
       <h6>Race/Ethnicity of Client Base</h6>
       <dt>African American</dt>
-      <dd><%= partner.population_black || t(:not_provided) %></dd>
+      <dd><%= profile.population_black || t(:not_provided) %></dd>
 
       <dt>Caucasian</dt>
-      <dd><%= partner.population_white || t(:not_provided) %></dd>
+      <dd><%= profile.population_white || t(:not_provided) %></dd>
 
       <dt>Hispanic</dt>
-      <dd><%= partner.population_hispanic || t(:not_provided) %></dd>
+      <dd><%= profile.population_hispanic || t(:not_provided) %></dd>
 
       <dt>Asian</dt>
-      <dd><%= partner.population_asian || t(:not_provided) %></dd>
+      <dd><%= profile.population_asian || t(:not_provided) %></dd>
 
       <dt>American Indian</dt>
-      <dd><%= partner.population_american_indian || t(:not_provided) %></dd>
+      <dd><%= profile.population_american_indian || t(:not_provided) %></dd>
 
       <dt>Pacific Islander</dt>
-      <dd><%= partner.population_island || t(:not_provided) %></dd>
+      <dd><%= profile.population_island || t(:not_provided) %></dd>
 
       <dt>Multi-racial</dt>
-      <dd><%= partner.population_multi_racial || t(:not_provided) %></dd>
+      <dd><%= profile.population_multi_racial || t(:not_provided) %></dd>
 
       <dt>Other</dt>
-      <dd><%= partner.population_other || t(:not_provided) %></dd>
+      <dd><%= profile.population_other || t(:not_provided) %></dd>
 
       <dt>Zip Codes Served</dt>
-      <dd><%= partner.zips_served %></dd>
+      <dd><%= profile.zips_served %></dd>
 
       <h6>Poverty Information of Those Served</h6>
       <dt>At FPL or below</dt>
-      <dd><%= partner.at_fpl_or_below || t(:not_provided) %></dd>
+      <dd><%= profile.at_fpl_or_below || t(:not_provided) %></dd>
 
       <dt>Above 1-2 times FPL</dt>
-      <dd><%= partner.above_1_2_times_fpl || t(:not_provided) %></dd>
+      <dd><%= profile.above_1_2_times_fpl || t(:not_provided) %></dd>
 
       <dt>Greater than 2 times FPL</dt>
-      <dd><%= partner.greater_2_times_fpl || t(:not_provided) %></dd>
+      <dd><%= profile.greater_2_times_fpl || t(:not_provided) %></dd>
 
       <dt>Poverty Unknown</dt>
-      <dd><%= partner.poverty_unknown || t(:not_provided) %></dd>
+      <dd><%= profile.poverty_unknown || t(:not_provided) %></dd>
     </dl>
   </div>
 </div>
diff --git a/app/views/partners/profiles/show/_sources_of_funding.html.erb b/app/views/partners/profiles/show/_sources_of_funding.html.erb
index bdc731a4b3..52e160d147 100644
--- a/app/views/partners/profiles/show/_sources_of_funding.html.erb
+++ b/app/views/partners/profiles/show/_sources_of_funding.html.erb
@@ -3,16 +3,16 @@
   <div class="card-body">
     <dl>
       <dt>Sources of Funding</dt>
-      <dd><%= partner.sources_of_funding %></dd>
+      <dd><%= profile.sources_of_funding %></dd>
 
       <dt>How do you currently obtain diapers?</dt>
-      <dd><%= partner.sources_of_diapers %></dd>
+      <dd><%= profile.sources_of_diapers %></dd>
 
       <dt>Essentials Budget</dt>
-      <dd><%= partner.essentials_budget %></dd>
+      <dd><%= profile.essentials_budget %></dd>
 
       <dt>Essentials Funding Source</dt>
-      <dd><%= partner.essentials_funding_source %></dd>
+      <dd><%= profile.essentials_funding_source %></dd>
     </dl>
   </div>
 </div>
diff --git a/app/views/partners/requests/_request_options_card.html.erb b/app/views/partners/requests/_request_options_card.html.erb
index 1cafefda77..d9631fb378 100644
--- a/app/views/partners/requests/_request_options_card.html.erb
+++ b/app/views/partners/requests/_request_options_card.html.erb
@@ -3,7 +3,7 @@
 
   <div class="d-flex">
 
-    <% if current_partner.enable_quantity_based_requests? %>
+    <% if current_partner.profile.enable_quantity_based_requests? %>
       <article class="col d-flex flex-column justify-content-between p-4 mr-4 border border-primary rounded shadow">
         <div>
           <h3 class='mb-0'>Quantity</h3>
@@ -17,7 +17,7 @@
       </article>
     <% end %>
 
-    <% if current_partner.enable_child_based_requests? %>
+    <% if current_partner.profile.enable_child_based_requests? %>
       <article class="col d-flex flex-column justify-content-between p-4 mr-4 border border-primary rounded shadow">
         <div>
           <h3 class='mb-0'>Child</h3>
@@ -31,7 +31,7 @@
       </article>
     <% end %>
 
-    <% if current_partner.enable_individual_requests? %>
+    <% if current_partner.profile.enable_individual_requests? %>
       <article class="col d-flex flex-column justify-content-between p-4 border border-primary rounded shadow">
         <div>
           <h3 class='mb-0'># of Individuals</h3>
diff --git a/app/views/partners/requests/index.html.erb b/app/views/partners/requests/index.html.erb
index f761693ac8..91cebae6b4 100644
--- a/app/views/partners/requests/index.html.erb
+++ b/app/views/partners/requests/index.html.erb
@@ -28,7 +28,7 @@
     <div class="row">
       <div class="col-md-12">
         <!-- Default box -->
-        <%= render 'request_options_card' if @partner.verified? %>
+        <%= render 'request_options_card' if @partner.approved? %>
       </div>
     </div>
   </div>
diff --git a/app/views/partners/requests/new.html.erb b/app/views/partners/requests/new.html.erb
index dd502f736b..03e07e9ef3 100644
--- a/app/views/partners/requests/new.html.erb
+++ b/app/views/partners/requests/new.html.erb
@@ -30,7 +30,8 @@
               <%= render partial: 'partners/requests/error' %>
             <% end %>
 
-            <%= simple_form_for @partner_request, html: {role: 'form', class: 'form-horizontal'} do |form| %>
+            <%= simple_form_for @partner_request, url: partners_requests_path(@partner_request, :organization_id => current_partner.organization.id),
+                                html: {role: 'form', class: 'form-horizontal'}, method: :post do |form| %>
               <%= form.input :comments, label: "Comments:", as: :text, class: "form-control", wrapper: :input_group %>
 
               <table class='table'>
diff --git a/app/views/profiles/edit.html.erb b/app/views/profiles/edit.html.erb
index 4696727732..49df3a85fe 100644
--- a/app/views/profiles/edit.html.erb
+++ b/app/views/profiles/edit.html.erb
@@ -16,22 +16,26 @@
       <div class="col-md-12">
         <div class="card-transparent">
           <%= simple_form_for @partner, url: profile_path, html: {role: 'form', class: 'form-horizontal'} do |form| %>
-            <div class="row">
-              <div class="col-6">
-                <%= render partial: "partners/profiles/edit/agency_information", locals: {form: form, partner: @partner} %>
-              </div>
-              <% @partner.partials_to_show.each do |partial| %>
+            <%= simple_fields_for :profile, @partner.profile do |profile_form| %>
+              <div class="row">
                 <div class="col-6">
-                  <%= render partial: "partners/profiles/edit/#{partial}", locals: {form: form, partner: @partner} %>
+                  <%= render partial: "partners/profiles/edit/agency_information",
+                             locals: {form: form, partner: @partner, profile: @partner.profile, profile_form: profile_form} %>
+                </div>
+                <% @partner.partials_to_show.each do |partial| %>
+                  <div class="col-6">
+                    <%= render partial: "partners/profiles/edit/#{partial}",
+                               locals: {form: profile_form, partner: @partner, profile: @partner.profile} %>
+                  </div>
+                <% end %>
+                <div class="col-6">
+                  <%= render partial: "partners/profiles/edit/partner_settings", locals: {form: profile_form } %>
                 </div>
               <% end %>
-              <div class="col-6">
-                <%= render partial: "partners/profiles/edit/partner_settings", locals: {form: form, partner: @partner} %>
-              </div>
             </div>
             <div class="card-footer">
               <%= form.submit("Update Information", class: "btn btn-primary") %>
-              <%= link_to "Cancel Update", partner_path(@partner.partner), class: "btn btn-danger float-right" %>
+              <%= link_to "Cancel Update", partner_path(@partner), class: "btn btn-danger float-right" %>
             </div>
           <% end %>
         </div>
diff --git a/app/views/requests/show.html.erb b/app/views/requests/show.html.erb
index 17f0d90e4f..653acf339f 100644
--- a/app/views/requests/show.html.erb
+++ b/app/views/requests/show.html.erb
@@ -92,7 +92,8 @@
           <div class="card-footer flex flex-row space-x-2">
             <%= submit_button_to start_request_path(@request), {text: "Fulfill request", size: "md"} unless @request.distribution %>
             <%= view_button_to(distribution_path(@request.distribution), {text: "View Associated Distribution", size: "md"}) if @request.distribution %>
-            <%= button_to 'Cancel', new_request_cancelation_path(organization: @organization, request_id: @request.id), method: :get, class: 'btn btn-danger btn-md' %>
+            <%= button_to 'Cancel', new_request_cancelation_path(organization: @organization, request_id: @request.id),
+                          method: :get, form_class: 'd-inline', class: 'btn btn-danger btn-md' %>
         </div>
       </div>
     </div>
diff --git a/db/migrate/20220819194804_migrate_roles.rb b/db/migrate/20220819194804_migrate_roles.rb
index a3b8be76fe..b5a9700a01 100644
--- a/db/migrate/20220819194804_migrate_roles.rb
+++ b/db/migrate/20220819194804_migrate_roles.rb
@@ -6,7 +6,7 @@ def up
         user.add_role(:org_user, org) if org
       end
       if user.partner_id.present?
-        partner = Partners::Partner.find_by_id(user.partner_id)
+        partner = Partner.find_by_id(user.partner_id)
         user.add_role(:partner, partner)
       end
       if user.read_attribute(:super_admin)
diff --git a/db/migrate/20221028192638_move_partner_for_roles.rb b/db/migrate/20221028192638_move_partner_for_roles.rb
new file mode 100644
index 0000000000..bd533b24cc
--- /dev/null
+++ b/db/migrate/20221028192638_move_partner_for_roles.rb
@@ -0,0 +1,30 @@
+class MovePartnerForRoles < ActiveRecord::Migration[7.0]
+  Partner # load this so Rolify doesn't get confused that we don't have the resource type
+
+  def up
+    unless column_exists?(:roles, :old_resource_id)
+      add_column :roles, :old_resource_id, :bigint
+    end
+
+    update_sql = <<-SQL
+      UPDATE roles 
+      SET old_resource_id=resource_id 
+      WHERE old_resource_id IS NULL AND resource_type='Partners::Partner'
+SQL
+    Role.connection.execute(update_sql)
+
+    Role.where(resource_type: 'Partners::Partner').find_each do |record|
+      record.update!(
+        resource_type: 'Partner',
+        resource_id: Partners::Profile.find_by(id: record.old_resource_id).partner_id
+      )
+    end
+  end
+
+  def down
+    if column_exists?(:roles, :old_resource_id)
+      remove_column :roles, :old_resource_id
+    end
+  end
+
+end
diff --git a/db/migrate/20221028194319_move_partner_for_families.rb b/db/migrate/20221028194319_move_partner_for_families.rb
new file mode 100644
index 0000000000..74afa8bccb
--- /dev/null
+++ b/db/migrate/20221028194319_move_partner_for_families.rb
@@ -0,0 +1,60 @@
+class MovePartnerForFamilies < ActiveRecord::Migration[7.0]
+  KLASS = Partners::Family
+
+  def up
+    table_name = KLASS.table_name
+
+    unless column_exists?(table_name, :old_partner_id)
+      add_column table_name, :old_partner_id, :bigint
+    end
+    if foreign_key_exists?(table_name, :partner_profiles, column: :partner_id)
+      remove_foreign_key(table_name, :partner_profiles, column: :partner_id)
+    end
+    if foreign_key_exists?(:partner_users, column: :partner_id)
+      remove_foreign_key(:partner_users, column: :partner_id)
+    end
+    if foreign_key_exists?(:users, column: :partner_id)
+      remove_foreign_key(:users, column: :partner_id)
+    end
+
+    update_sql = "UPDATE #{table_name} SET old_partner_id=partner_id WHERE old_partner_id IS NULL"
+    KLASS.connection.execute(update_sql)
+
+    KLASS.find_each do |record|
+      record.guardian_first_name = 'UNKNOWN' if record.guardian_first_name.blank?
+      record.guardian_last_name = 'UNKNOWN' if record.guardian_last_name.blank?
+      record.guardian_zip_code = 'UNKNOWN' if record.guardian_zip_code.blank?
+      old_partner = Partners::Profile.find_by(id: record.old_partner_id)
+      if old_partner.nil?
+        record.destroy
+        next
+      end
+
+      new_partner = Partner.find_by(id: old_partner.partner_id)
+      if new_partner.nil?
+        puts "Partner doesn't exist for #{old_partner.id} family #{record.id}"
+        old_partner.destroy
+        record.destroy
+        next
+      end
+      record.update!(partner_id: old_partner.partner_id)
+    end
+
+    unless foreign_key_exists?(table_name, :partners)
+      safety_assured { add_foreign_key(table_name, :partners) }
+    end
+
+  end
+
+  def down
+    table_name = KLASS.table_name
+
+    if column_exists?(table_name, :old_partner_id)
+      remove_column table_name, :old_partner_id
+    end
+    unless foreign_key_exists?(table_name, :partner_profiles, column: :partner_id)
+      add_foreign_key(table_name, :partner_profiles, column: :partner_id)
+    end
+  end
+
+end
diff --git a/db/migrate/20221104191611_move_item_request_index.rb b/db/migrate/20221104191611_move_item_request_index.rb
new file mode 100644
index 0000000000..6aefb9db95
--- /dev/null
+++ b/db/migrate/20221104191611_move_item_request_index.rb
@@ -0,0 +1,44 @@
+class MoveItemRequestIndex < ActiveRecord::Migration[7.0]
+  def up
+    if foreign_key_exists?(:item_requests, :partner_requests)
+      remove_foreign_key :item_requests, :partner_requests
+    end
+    unless column_exists?(:item_requests, :old_partner_request_id, :integer)
+      add_column :item_requests, :old_partner_request_id, :integer
+    end
+    sql = <<-SQL
+      UPDATE item_requests
+      SET old_partner_request_id=partner_request_id
+      WHERE old_partner_request_id IS NULL
+    SQL
+    ApplicationRecord.connection.execute(sql)
+    sql = <<-SQL
+      select id, created_at, partner_id from partner_requests 
+      ORDER BY created_at DESC
+    SQL
+    rows = ApplicationRecord.connection.select_all(sql)
+    rows.each do |request|
+      from = request['created_at'] - 10.seconds
+      to = request['created_at'] + 10.seconds
+      new_partner = Partners::Profile.find_by_id(request['partner_id'])&.partner_id
+      next if new_partner.nil?
+
+      new_request = Request.where(partner_id: new_partner).
+        where("CREATED_AT BETWEEN '#{from.to_fs(:db)}' AND '#{to.to_fs(:db)}'").first
+      next if new_request.nil?
+
+      Partners::ItemRequest.where(old_partner_request_id: request['id']).
+        update_all(partner_request_id: new_request.id, updated_at: Time.zone.now)
+    end
+  end
+
+  def down
+    unless foreign_key_exists?(:item_requests, column: :partner_request_id)
+      add_foreign_key :item_requests, :partner_requests, column: :partner_request_id
+    end
+    if column_exists?(:item_requests, :old_partner_request_id, :integer)
+      remove_column :item_requests, :old_partner_request_id, :integer
+    end
+  end
+
+end
diff --git a/db/schema.rb b/db/schema.rb
index 813bdc8ee7..cab9dbaed8 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.0].define(version: 2022_10_23_013754) do
+ActiveRecord::Schema[7.0].define(version: 2022_11_04_191611) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -265,6 +265,7 @@
     t.datetime "updated_at", precision: nil, null: false
     t.bigint "partner_id"
     t.boolean "military", default: false
+    t.bigint "old_partner_id"
     t.index ["partner_id"], name: "index_families_on_partner_id"
   end
 
@@ -318,6 +319,7 @@
     t.datetime "updated_at", precision: nil, null: false
     t.string "partner_key"
     t.integer "item_id"
+    t.integer "old_partner_request_id"
     t.index ["item_id"], name: "index_item_requests_on_item_id"
     t.index ["partner_request_id"], name: "index_item_requests_on_partner_request_id"
   end
@@ -661,6 +663,7 @@
     t.bigint "resource_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "old_resource_id"
     t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
     t.index ["resource_type", "resource_id"], name: "index_roles_on_resource"
   end
@@ -781,11 +784,10 @@
   add_foreign_key "donations", "manufacturers"
   add_foreign_key "donations", "product_drives"
   add_foreign_key "donations", "storage_locations"
-  add_foreign_key "families", "partner_profiles", column: "partner_id"
+  add_foreign_key "families", "partners"
   add_foreign_key "item_categories", "organizations"
   add_foreign_key "item_categories_partner_groups", "item_categories"
   add_foreign_key "item_categories_partner_groups", "partner_groups"
-  add_foreign_key "item_requests", "partner_requests"
   add_foreign_key "items", "item_categories"
   add_foreign_key "items", "kits"
   add_foreign_key "kits", "organizations"
@@ -794,11 +796,9 @@
   add_foreign_key "organizations", "ndbn_members", primary_key: "ndbn_member_id"
   add_foreign_key "partner_groups", "organizations"
   add_foreign_key "partner_requests", "users", column: "partner_user_id"
-  add_foreign_key "partner_users", "partner_profiles", column: "partner_id"
   add_foreign_key "partners", "storage_locations", column: "default_storage_location_id"
   add_foreign_key "product_drives", "organizations"
   add_foreign_key "requests", "distributions"
   add_foreign_key "requests", "organizations"
   add_foreign_key "requests", "partners"
-  add_foreign_key "users", "partner_profiles", column: "partner_id"
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index 47f55f1027..6fcb609ff2 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -173,13 +173,6 @@ def random_record_for_org(org, klass)
 # Partners & Associated Data
 # ----------------------------------------------------------------------------
 
-partner_status_map = {
-  pending: "pending",
-  recertification_required: "recertification_required",
-  approved: "verified",
-  verified: "verified"
-}
-
 note = [
   "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ac enim orci. Donec id consequat est. Vivamus luctus vel erat quis tincidunt. Nunc quis varius justo. Integer quam augue, dictum vitae bibendum in, fermentum quis felis. Nam euismod ultrices velit a tristique. Vestibulum sed tincidunt erat. Vestibulum et ullamcorper sem. Sed ante leo, molestie vitae augue ac, aliquam ultrices enim."
 ]
@@ -215,16 +208,7 @@ def random_record_for_org(org, klass)
     partner.partner_group = pdx_org.partner_groups.first
   end
 
-
-
-  # ----------------------------------------------------------------------------
-  # Creating associated records within the Partnerbase database
-  #
-  # **We have two separate database. One for diaperbase and the other for partnerbase**
-  # ----------------------------------------------------------------------------
-
-  partner = Partners::Partner.create!({
-                                        name: p.name,
+  profile = Partners::Profile.create!({
                                         address1: Faker::Address.street_address,
                                         address2: "",
                                         city: Faker::Address.city,
@@ -232,8 +216,6 @@ def random_record_for_org(org, klass)
                                         zip_code: Faker::Address.zip,
                                         website: Faker::Internet.domain_name,
                                         zips_served: Faker::Address.zip,
-                                        essentials_bank_id: pdx_org.id,
-                                        partner_id: p.id,
                                         executive_director_name: Faker::Name.name,
                                         executive_director_email: p.email,
                                         executive_director_phone: Faker::PhoneNumber.phone_number,
@@ -243,9 +225,7 @@ def random_record_for_org(org, klass)
                                         primary_contact_mobile: Faker::PhoneNumber.phone_number,
                                         pick_up_name: Faker::Name.name,
                                         pick_up_email: Faker::Internet.email,
-                                        pick_up_phone: Faker::PhoneNumber.phone_number,
-                                        partner_status: partner_status_map[partner_option[:status]] || "pending",
-                                        status_in_diaper_base: partner_option[:status]
+                                        pick_up_phone: Faker::PhoneNumber.phone_number
                                       })
 
   user = ::User.create!(
@@ -257,7 +237,7 @@ def random_record_for_org(org, klass)
     last_sign_in_at: Time.utc(2021, 9, 9, 11, 34, 4)
   )
 
-  user.add_role(:partner, partner)
+  user.add_role(:partner, p)
 
   user_2 = ::User.create!(
     name: Faker::Name.name,
@@ -268,13 +248,13 @@ def random_record_for_org(org, klass)
     last_sign_in_at: Time.utc(2021, 9, 17, 11, 34, 4)
   )
 
-  user_2.add_role(:partner, partner)
+  user_2.add_role(:partner, p)
 
   #
   # Skip creating records that they would have created after
   # they've accepted the invitation
   #
-  next if partner.partner_status == 'pending'
+  next if p.status == 'uninvited'
 
   families = (1..Faker::Number.within(range: 4..13)).to_a.map do
     Partners::Family.create!(
@@ -294,7 +274,7 @@ def random_record_for_org(org, klass)
       guardian_health_insurance: Partners::Family::INSURANCE_TYPES.sample,
       comments: Faker::Lorem.paragraph,
       military: false,
-      partner: partner
+      partner: p
     )
   end
 
@@ -322,7 +302,7 @@ def random_record_for_org(org, klass)
         comments: Faker::Lorem.paragraph,
         active: Faker::Boolean.boolean,
         archived: false,
-        item_needed_diaperid: partner.organization.item_id_to_display_string_map.key(Partners::Child::CHILD_ITEMS.sample)
+        item_needed_diaperid: p.organization.item_id_to_display_string_map.key(Partners::Child::CHILD_ITEMS.sample)
       )
     end
 
@@ -340,17 +320,16 @@ def random_record_for_org(org, klass)
         comments: Faker::Lorem.paragraph,
         active: Faker::Boolean.boolean,
         archived: false,
-        item_needed_diaperid: partner.organization.item_id_to_display_string_map.key(Partners::Child::CHILD_ITEMS.sample)
+        item_needed_diaperid: p.organization.item_id_to_display_string_map.key(Partners::Child::CHILD_ITEMS.sample)
       )
     end
   end
 
   Faker::Number.within(range: 32..56).times do
-    pr = Partners::Request.new(
+    pr = Request.new(
       comments: Faker::Lorem.paragraph,
-      partner: partner,
-      for_families: Faker::Boolean.boolean,
-      partner_user: partner.primary_user
+      partner: p,
+      partner_user: p.primary_user
     )
 
     # Ensure that the item requests are valid with
@@ -577,30 +556,6 @@ def seed_quantity(item_name, organization, storage_location, quantity)
   distribution.storage_location.decrease_inventory(distribution)
 end
 
-# ----------------------------------------------------------------------------
-# Requests
-# ----------------------------------------------------------------------------
-
-20.times.each do |count|
-  status = count > 15 ? 'fulfilled' : 'pending'
-
-  org_items = pdx_org.items.pluck(:id)
-  request_items = Array.new(Faker::Number.within(range: 3..8)).map do |_item|
-    {
-      "item_id" => org_items.sample,
-      "quantity" => Faker::Number.within(range: 5..10)
-    }
-  end
-
-  Request.create(
-    partner: random_record_for_org(pdx_org, Partner),
-    organization: pdx_org,
-    request_items: request_items,
-    comments: "Urgent",
-    status: status
-  )
-end
-
 # ----------------------------------------------------------------------------
 # Vendors
 # ----------------------------------------------------------------------------
diff --git a/spec/factories/partner_user.rb b/spec/factories/partner_user.rb
index dfa339230d..7c719c7088 100644
--- a/spec/factories/partner_user.rb
+++ b/spec/factories/partner_user.rb
@@ -7,7 +7,7 @@
     invitation_sent_at { Time.current - 1.day }
     last_sign_in_at { Time.current }
     transient do
-      partner { Partners::Partner.first || create(:partners_partner) }
+      partner { Partner.first || create(:partner) }
     end
     after(:create) do |user, evaluator|
       user.add_role(Role::PARTNER, evaluator.partner)
diff --git a/spec/factories/partners.rb b/spec/factories/partners.rb
index 9c9ea28438..a961adbd73 100644
--- a/spec/factories/partners.rb
+++ b/spec/factories/partners.rb
@@ -42,9 +42,9 @@
     after(:create) do |partner, evaluator|
       next if evaluator.try(:without_profile)
 
-      # Create associated records on partnerbase DB
-      partners_partner = create(:partners_partner, essentials_bank_id: partner.organization_id, partner_id: partner.id, name: partner.name)
-      create(:partners_user, email: partner.email, name: partner.name, partner: partners_partner)
+      # Create associated records
+      create(:partner_profile, partner_id: partner.id)
+      create(:partners_user, email: partner.email, name: partner.name, partner: partner)
     end
   end
 end
diff --git a/spec/factories/partners/family.rb b/spec/factories/partners/family.rb
index 1539e2d9d1..8684f902b1 100644
--- a/spec/factories/partners/family.rb
+++ b/spec/factories/partners/family.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :partners_family, class: Partners::Family do
-    association :partner, factory: :partners_partner
+    association :partner
 
     comments                  { Faker::Lorem.paragraph }
     # Faker doesn't have county, community is same flavour, we don't use it, and it is not country.
diff --git a/spec/factories/partners/partner.rb b/spec/factories/partners/profile.rb
similarity index 51%
rename from spec/factories/partners/partner.rb
rename to spec/factories/partners/profile.rb
index 1f4e8c41ab..76bce57e74 100644
--- a/spec/factories/partners/partner.rb
+++ b/spec/factories/partners/profile.rb
@@ -1,5 +1,6 @@
 FactoryBot.define do
-  factory :partners_partner, class: Partners::Partner do
+  factory :partner_profile, class: Partners::Profile do
+    partner { Partner.first || create(:partner) }
     essentials_bank_id { Organization.try(:first).id || create(:organization).id }
   end
 end
diff --git a/spec/factories/partners/user.rb b/spec/factories/partners/user.rb
index 71affd6246..26cd34591c 100644
--- a/spec/factories/partners/user.rb
+++ b/spec/factories/partners/user.rb
@@ -7,7 +7,7 @@
     invitation_sent_at { Time.current - 1.day }
     last_sign_in_at { Time.current }
     transient do
-      partner { Partners::Partner.first || create(:partners_partner) }
+      partner { Partner.first || create(:partner) }
     end
     after(:create) do |instance, evaluator|
       instance.add_role(Role::PARTNER, evaluator.partner)
diff --git a/spec/factories/roles.rb b/spec/factories/roles.rb
index 149a636c65..f0e4f23c6e 100644
--- a/spec/factories/roles.rb
+++ b/spec/factories/roles.rb
@@ -2,12 +2,13 @@
 #
 # Table name: roles
 #
-#  id            :bigint           not null, primary key
-#  name          :string
-#  resource_type :string
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
-#  resource_id   :bigint
+#  id              :bigint           not null, primary key
+#  name            :string
+#  resource_type   :string
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  old_resource_id :bigint
+#  resource_id     :bigint
 #
 FactoryBot.define do
   factory :role do
diff --git a/spec/mailers/custom_devise_mailer_spec.rb b/spec/mailers/custom_devise_mailer_spec.rb
index addec01025..3806f84a71 100644
--- a/spec/mailers/custom_devise_mailer_spec.rb
+++ b/spec/mailers/custom_devise_mailer_spec.rb
@@ -6,13 +6,13 @@
     context "when partner is invited" do
       let(:partner) do
         partner = create(:partner, :uninvited)
-        partner.profile.primary_user.delete
-        partner.profile.reload
+        partner.primary_user.delete
+        partner.reload
         partner
       end
 
       let(:user) do
-        create(:partner_user, partner: partner.profile)
+        create(:partner_user, partner: partner)
       end
 
       it "invites to primary user" do
@@ -23,7 +23,7 @@
 
     context "when other partner users invited" do
       let(:partner) { create(:partner) }
-      let(:user) { create(:partner_user, partner: partner.profile) }
+      let(:user) { create(:partner_user, partner: partner) }
 
       it "invites to partner user" do
         expect(mail.subject).to eq("You've been invited to #{user.partner.name}'s partnerbase account")
diff --git a/spec/models/partner_spec.rb b/spec/models/partner_spec.rb
index 52c6fe3880..fcf1c78bfc 100644
--- a/spec/models/partner_spec.rb
+++ b/spec/models/partner_spec.rb
@@ -25,6 +25,23 @@
     it { should have_many(:requests) }
     it { should have_many(:distributions) }
     it { should have_many(:requests) }
+    it { should have_many(:users).dependent(:destroy) }
+    it { should have_many(:families).dependent(:destroy) }
+    it { should have_many(:children).through(:families) }
+
+    describe 'primary_user' do
+      subject { partner.primary_user }
+      let(:partner) { create(:partner) }
+      before do
+        second_user = partner.primary_user.clone
+        second_user.email = Faker::Internet.email
+        second_user.save!
+      end
+
+      it 'should return the first user ever created for a partner' do
+        expect(subject).to eq(partner.primary_user)
+      end
+    end
   end
 
   context "Validations >" do
@@ -144,14 +161,14 @@
       end
       context 'when it has a profile but no users' do
         it 'should return true' do
-          create(:partners_partner, essentials_bank_id: partner.organization_id, partner_id: partner.id, name: partner.name)
+          create(:partner_profile, partner_id: partner.id, name: partner.name)
           expect(partner.reload).to be_deletable
         end
       end
       context 'when it has a profile and users' do
         it 'should return false' do
-          partners_partner = create(:partners_partner, essentials_bank_id: partner.organization_id, partner_id: partner.id, name: partner.name)
-          create(:partners_user, email: partner.email, name: partner.name, partner: partners_partner)
+          create(:partner_profile, partner_id: partner.id)
+          create(:partners_user, email: partner.email, name: partner.name, partner: partner)
           expect(partner.reload).not_to be_deletable
         end
       end
@@ -172,7 +189,7 @@
         expect(UserInviteService).to have_received(:invite).with(
           email: "randomtest@email.com",
           roles: [Role::PARTNER],
-          resource: partner.profile
+          resource: partner
         )
       end
     end
@@ -185,7 +202,7 @@
         expect(UserInviteService).not_to have_received(:invite).with(
           email: "randomtest@email.com",
           roles: [Role::PARTNER],
-          resource: partner.profile
+          resource: partner
         )
       end
     end
@@ -194,18 +211,8 @@
     subject { partner.profile }
     let(:partner) { create(:partner) }
 
-    it 'should return the associated Partners::Partner record' do
-      expect(subject).to eq(Partners::Partner.find_by(partner_id: partner.id))
-    end
-  end
-
-  describe '#primary_partner_user' do
-    subject { partner.primary_partner_user }
-    let(:partner) { create(:partner) }
-
-    it 'should return the associated primary User' do
-      partner_users = ::User.with_role(Role::PARTNER, partner.profile)
-      expect(partner_users).to include(subject)
+    it 'should return the associated Partners::Profile record' do
+      expect(subject).to eq(Partners::Profile.find_by(partner_id: partner.id))
     end
   end
 
@@ -287,4 +294,24 @@
       expect(partner).to be_valid
     end
   end
+
+  describe "#impact_metrics" do
+    subject { partner.impact_metrics }
+    let(:partner) { FactoryBot.create(:partner) }
+
+    context "when partner has related information" do
+      let!(:family1) { FactoryBot.create(:partners_family, guardian_zip_code: "45612-123", partner: partner) }
+      let!(:family2) { FactoryBot.create(:partners_family, guardian_zip_code: "45612-126", partner: partner) }
+      let!(:family3) { FactoryBot.create(:partners_family, guardian_zip_code: "45612-123", partner: partner) }
+
+      let!(:child1) { FactoryBot.create_list(:partners_child, 2, family: family1) }
+      let!(:child2) { FactoryBot.create_list(:partners_child, 2, family: family3) }
+
+      it { is_expected.to eq({families_served: 3, children_served: 4, family_zipcodes: 2, family_zipcodes_list: %w[45612-123 45612-126]}) }
+    end
+
+    context "when partner don't have any related information" do
+      it { is_expected.to eq({families_served: 0, children_served: 0, family_zipcodes: 0, family_zipcodes_list: []}) }
+    end
+  end
 end
diff --git a/spec/models/partners/family_spec.rb b/spec/models/partners/family_spec.rb
index 7cac540f6a..8248a689c6 100644
--- a/spec/models/partners/family_spec.rb
+++ b/spec/models/partners/family_spec.rb
@@ -21,6 +21,7 @@
 #  sources_of_income         :jsonb
 #  created_at                :datetime         not null
 #  updated_at                :datetime         not null
+#  old_partner_id            :bigint
 #  partner_id                :bigint
 #
 
diff --git a/spec/models/partners/item_request_spec.rb b/spec/models/partners/item_request_spec.rb
index 427f393600..d96c4a9d26 100644
--- a/spec/models/partners/item_request_spec.rb
+++ b/spec/models/partners/item_request_spec.rb
@@ -2,20 +2,21 @@
 #
 # Table name: item_requests
 #
-#  id                 :bigint           not null, primary key
-#  name               :string
-#  partner_key        :string
-#  quantity           :string
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  item_id            :integer
-#  partner_request_id :bigint
+#  id                     :bigint           not null, primary key
+#  name                   :string
+#  partner_key            :string
+#  quantity               :string
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  item_id                :integer
+#  old_partner_request_id :integer
+#  partner_request_id     :bigint
 #
 require "rails_helper"
 
 RSpec.describe Partners::ItemRequest, type: :model do
   describe 'associations' do
-    it { should belong_to(:request).class_name('Partners::Request').with_foreign_key(:partner_request_id) }
+    it { should belong_to(:request).class_name('::Request').with_foreign_key(:partner_request_id) }
     it { should have_many(:child_item_requests).dependent(:destroy) }
     it { should have_many(:children).through(:child_item_requests) }
   end
diff --git a/spec/models/partners/partner_form_spec.rb b/spec/models/partners/partner_form_spec.rb
deleted file mode 100644
index 1480193594..0000000000
--- a/spec/models/partners/partner_form_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# == Schema Information
-#
-# Table name: partner_forms
-#
-#  id                 :bigint           not null, primary key
-#  sections           :text             default([]), is an Array
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  essentials_bank_id :integer
-#
-require "rails_helper"
-
-RSpec.describe Partners::PartnerForm, type: :model do
-  describe 'associations' do
-    it { should have_one(:partner).with_primary_key(:essentials_bank_id).with_foreign_key(:essentials_bank_id) }
-  end
-
-  describe 'validations' do
-    it { should validate_presence_of(:essentials_bank_id) }
-    it { should validate_uniqueness_of(:essentials_bank_id) }
-  end
-end
-
-
-
diff --git a/spec/models/partners/partner_spec.rb b/spec/models/partners/profile_spec.rb
similarity index 58%
rename from spec/models/partners/partner_spec.rb
rename to spec/models/partners/profile_spec.rb
index 5d0210c12a..60f2963300 100644
--- a/spec/models/partners/partner_spec.rb
+++ b/spec/models/partners/profile_spec.rb
@@ -81,35 +81,16 @@
 #
 require "rails_helper"
 
-RSpec.describe Partners::Partner, type: :model do
-  describe 'associations' do
-    it { should have_many(:users).dependent(:destroy) }
-    it { should have_many(:requests).dependent(:destroy) }
-    it { should have_many(:families).dependent(:destroy) }
-    it { should have_many(:children).through(:families) }
-    it { should have_one(:partner_form).with_primary_key(:essentials_bank_id).with_foreign_key(:essentials_bank_id).dependent(:destroy) }
+RSpec.describe Partners::Profile, type: :model do
+  describe "associations" do
     it { should have_one_attached(:proof_of_partner_status) }
     it { should have_one_attached(:proof_of_form_990) }
     it { should have_many_attached(:documents) }
-
-    describe 'primary_user' do
-      subject { partner.primary_user }
-      let(:partner) { create(:partner).profile }
-      before do
-        second_user = partner.primary_user.clone
-        second_user.email = Faker::Internet.email
-        second_user.save!
-      end
-
-      it 'should return the first user ever created for a partner' do
-        expect(subject).to eq(partner.primary_user)
-      end
-    end
   end
 
   describe "social media info validation for partners" do
     context "no social media presence and the checkbox isn't checked" do
-      let(:partner) { FactoryBot.build(:partners_partner, website: "", twitter: "", facebook: "", instagram: "", no_social_media_presence: false) }
+      let(:partner) { FactoryBot.build(:partner_profile, website: "", twitter: "", facebook: "", instagram: "", no_social_media_presence: false) }
 
       it "should not be valid" do
         expect(partner.valid?).to eq(false)
@@ -117,7 +98,7 @@
     end
 
     context "no social media presence and the checkbox is checked" do
-      let(:partner) { FactoryBot.build(:partners_partner, website: "", twitter: "", facebook: "", instagram: "", no_social_media_presence: true) }
+      let(:partner) { FactoryBot.build(:partner_profile, website: "", twitter: "", facebook: "", instagram: "", no_social_media_presence: true) }
 
       it "should be valid" do
         expect(partner.valid?).to eq(true)
@@ -125,7 +106,7 @@
     end
 
     context "has social media presence and the checkbox is unchecked" do
-      let(:partner) { FactoryBot.build(:partners_partner, no_social_media_presence: false) }
+      let(:partner) { FactoryBot.build(:partner_profile, no_social_media_presence: false) }
 
       it "with just a website it should be valid" do
         partner.update(website: "some website URL", twitter: "", facebook: "", instagram: "")
@@ -153,77 +134,4 @@
       end
     end
   end
-
-  describe '#verified?' do
-    subject { partner.verified? }
-    let(:partner) { FactoryBot.build(:partners_partner, partner_status: partner_status) }
-
-    context 'when the partner_status is verified' do
-      let(:partner_status) { 'verified' }
-
-      it 'should return true' do
-        expect(subject).to eq(true)
-      end
-    end
-
-    context 'when the partner_status i not verified' do
-      let(:partner_status) { 'not-verified' }
-
-      it 'should return false' do
-        expect(subject).to eq(false)
-      end
-    end
-  end
-
-  describe '#deactivated' do
-    subject { partner.deactivated? }
-    let(:partner) { FactoryBot.build(:partners_partner, status_in_diaper_base: status_in_diaper_base) }
-
-    context 'when the status_in_diaper_base is deactivated' do
-      let(:status_in_diaper_base) { 'deactivated' }
-
-      it 'should return true' do
-        expect(subject).to eq(true)
-      end
-    end
-
-    context 'when the status_in_diaper_base is not deactivated' do
-      let(:status_in_diaper_base) { 'not-deactivated' }
-
-      it 'should return false' do
-        expect(subject).to eq(false)
-      end
-    end
-  end
-
-  describe '#organization' do
-    subject { partner.organization }
-    let(:partner) { FactoryBot.create(:partners_partner) }
-
-    it 'should return the associated organization using its essentials bank id' do
-      expect(subject).to eq(Organization.find_by!(id: partner.essentials_bank_id))
-    end
-  end
-
-  describe '#impact_metrics' do
-    subject { partner.impact_metrics }
-    let(:partner) { FactoryBot.create(:partners_partner) }
-
-    context 'when partner has related informations' do
-      let!(:family1) { FactoryBot.create(:partners_family, guardian_zip_code: '45612-123', partner: partner) }
-      let!(:family2) { FactoryBot.create(:partners_family, guardian_zip_code: '45612-126', partner: partner) }
-      let!(:family3) { FactoryBot.create(:partners_family, guardian_zip_code: '45612-123', partner: partner) }
-
-      let!(:child1) { FactoryBot.create_list(:partners_child, 2, family: family1) }
-      let!(:child2) { FactoryBot.create_list(:partners_child, 2, family: family3) }
-
-      it { is_expected.to eq({ families_served: 3, children_served: 4, family_zipcodes: 2, family_zipcodes_list: %w(45612-123 45612-126) }) }
-    end
-
-    context "when partner don't have any related informations" do
-      it { is_expected.to eq({ families_served: 0, children_served: 0, family_zipcodes: 0, family_zipcodes_list: [] }) }
-    end
-  end
 end
-
-
diff --git a/spec/models/partners/request_spec.rb b/spec/models/partners/request_spec.rb
deleted file mode 100644
index 0559cb7f6c..0000000000
--- a/spec/models/partners/request_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# == Schema Information
-#
-# Table name: partner_requests
-#
-#  id              :bigint           not null, primary key
-#  comments        :text
-#  for_families    :boolean
-#  sent            :boolean          default(FALSE), not null
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  organization_id :bigint
-#  partner_id      :bigint
-#  partner_user_id :integer
-#
-require "rails_helper"
-
-RSpec.describe Partners::Request, type: :model do
-  describe 'associations' do
-    it { should belong_to(:partner) }
-    it { should have_many(:item_requests).dependent(:destroy) }
-    it { should have_many(:child_item_requests).through(:item_requests) }
-  end
-
-  describe 'validations' do
-    it { should validate_presence_of(:partner) }
-    it { should validate_presence_of(:partner_user).on(:create) }
-    it { should accept_nested_attributes_for(:item_requests) }
-  end
-end
-
-
diff --git a/spec/models/role_spec.rb b/spec/models/role_spec.rb
index b8748b0232..ed315102d6 100644
--- a/spec/models/role_spec.rb
+++ b/spec/models/role_spec.rb
@@ -2,12 +2,13 @@
 #
 # Table name: roles
 #
-#  id            :bigint           not null, primary key
-#  name          :string
-#  resource_type :string
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
-#  resource_id   :bigint
+#  id              :bigint           not null, primary key
+#  name            :string
+#  resource_type   :string
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  old_resource_id :bigint
+#  resource_id     :bigint
 #
 require "rails_helper"
 
diff --git a/spec/requests/dashboard_requests_spec.rb b/spec/requests/dashboard_requests_spec.rb
index 2a25027109..c5cbf52c7b 100644
--- a/spec/requests/dashboard_requests_spec.rb
+++ b/spec/requests/dashboard_requests_spec.rb
@@ -19,7 +19,7 @@
 
       context 'with both roles' do
         it 'should include the switch link' do
-          partner = FactoryBot.create(:partners_partner)
+          partner = FactoryBot.create(:partner)
           @user.add_role(Role::PARTNER, partner)
           get dashboard_path(default_params)
           expect(response.body).to include('switch_to_role')
diff --git a/spec/requests/partners/children_requests_spec.rb b/spec/requests/partners/children_requests_spec.rb
index 64618f4538..ca42e7386a 100644
--- a/spec/requests/partners/children_requests_spec.rb
+++ b/spec/requests/partners/children_requests_spec.rb
@@ -1,10 +1,9 @@
 require "rails_helper"
 
 RSpec.describe "/partners/children", type: :request do
-  let(:partners_partner) { Partners::Partner.find_by(partner_id: partner.id) }
-  let(:partner_user) { partners_partner.primary_user }
+  let(:partner_user) { partner.primary_user }
   let(:partner) { create(:partner) }
-  let(:family) { create(:partners_family, partner: partners_partner) }
+  let(:family) { create(:partners_family, partner: partner) }
   let!(:child1) do
     create(:partners_child,
       first_name: "John",
diff --git a/spec/requests/partners/dashboard_requests_spec.rb b/spec/requests/partners/dashboard_requests_spec.rb
index 5b439c6253..e63f0d5666 100644
--- a/spec/requests/partners/dashboard_requests_spec.rb
+++ b/spec/requests/partners/dashboard_requests_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe "/partners/dashboard", type: :request do
   let(:partner) { create(:partner) }
-  let(:partner_user) { Partners::Partner.find_by(partner_id: partner.id).primary_user }
+  let(:partner_user) { partner.primary_user }
   let(:date) { 1.week.from_now }
   let(:past_date) { 1.week.ago }
   let(:item1) { create(:item, name: "Good item") }
diff --git a/spec/requests/partners/distributions_spec.rb b/spec/requests/partners/distributions_spec.rb
index 0746893feb..21c35f7905 100644
--- a/spec/requests/partners/distributions_spec.rb
+++ b/spec/requests/partners/distributions_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe "/partners/distributions", type: :request do
   let(:partner) { create(:partner) }
-  let(:partner_user) { Partners::Partner.find_by(partner_id: partner.id).primary_user }
+  let(:partner_user) { partner.primary_user }
 
   describe "GET #index" do
     subject { -> { get partners_distributions_path } }
diff --git a/spec/requests/partners/family_requests_controller_spec.rb b/spec/requests/partners/family_requests_controller_spec.rb
index ef84076df0..04b17f75f2 100644
--- a/spec/requests/partners/family_requests_controller_spec.rb
+++ b/spec/requests/partners/family_requests_controller_spec.rb
@@ -7,10 +7,9 @@
       hash["child-#{child.id}"] = true
     end
   end
-  let(:partners_partner) { Partners::Partner.find_by(partner_id: partner.id) }
-  let(:family) { create(:partners_family, partner_id: partners_partner.id) }
+  let(:family) { create(:partners_family, partner_id: partner.id) }
   let!(:children) { FactoryBot.create_list(:partners_child, 3, family: family) }
-  let(:partner_user) { partners_partner.primary_user }
+  let(:partner_user) { partner.primary_user }
 
   before { sign_in(partner_user) }
 
@@ -18,13 +17,13 @@
     subject { get new_partners_family_request_path }
 
     it "does not allow deactivated partners" do
-      partners_partner.update!(status_in_diaper_base: :deactivated)
+      partner.update!(status: :deactivated)
 
       expect(subject).to redirect_to(partners_requests_path)
     end
 
     it "does not allow partners not verified" do
-      partners_partner.update!(partner_status: :pending)
+      partner.update!(status: :uninvited)
 
       expect(subject).to redirect_to(partners_requests_path)
     end
@@ -40,19 +39,19 @@
     subject { post partners_family_requests_path, params: params }
 
     it "does not allow deactivated partners" do
-      partners_partner.update!(status_in_diaper_base: :deactivated)
+      partner.update!(status: :deactivated)
 
       expect(subject).to redirect_to(partners_requests_path)
     end
 
     it "does not allow partners not verified" do
-      partners_partner.update!(partner_status: :pending)
+      partner.update!(status: :uninvited)
 
       expect(subject).to redirect_to(partners_requests_path)
     end
 
     it "submits the request" do
-      partners_partner.update!(partner_status: :verified)
+      partner.update!(status: :approved)
 
       subject
 
diff --git a/spec/requests/partners/family_requests_spec.rb b/spec/requests/partners/family_requests_spec.rb
index 494f410afa..8c81656965 100644
--- a/spec/requests/partners/family_requests_spec.rb
+++ b/spec/requests/partners/family_requests_spec.rb
@@ -1,8 +1,7 @@
 require "rails_helper"
 
 RSpec.describe "/partners/family", type: :request do
-  let(:partners_partner) { Partners::Partner.find_by(partner_id: partner.id) }
-  let(:partner_user) { partners_partner.primary_user }
+  let(:partner_user) { partner.primary_user }
   let(:partner) { create(:partner) }
   let!(:family1) do
     create(:partners_family,
@@ -22,7 +21,7 @@
       guardian_health_insurance: "Medicaid",
       comments: "Some comment",
       military: false,
-      partner: partners_partner)
+      partner: partner)
   end
 
   let!(:family2) do
@@ -43,7 +42,7 @@
       guardian_health_insurance: "Medicaid",
       comments: "Some comment 2",
       military: true,
-      partner: partners_partner)
+      partner: partner)
   end
 
   describe "GET #index" do
@@ -61,8 +60,8 @@
       get partners_families_path, headers: headers
       csv = <<~CSV
         id,guardian_first_name,guardian_last_name,guardian_zip_code,guardian_county,guardian_phone,case_manager,home_adult_count,home_child_count,home_young_child_count,sources_of_income,guardian_employed,guardian_employment_type,guardian_monthly_pay,guardian_health_insurance,comments,created_at,updated_at,partner_id,military
-        #{family1.id},John,Smith,90210,Franklin,416-555-2345,Jane Smith,2,3,1,"SSI,TANF",true,Part-time,4.0,Medicaid,Some comment,#{family1.created_at},#{family1.updated_at},#{partner.profile.id},false
-        #{family2.id},Mark,Smith,90210,Jefferson,416-555-0987,Jane Smith,1,2,2,TANF,false,Part-time,4.0,Medicaid,Some comment 2,#{family2.created_at},#{family2.updated_at},#{partner.profile.id},true
+        #{family1.id},John,Smith,90210,Franklin,416-555-2345,Jane Smith,2,3,1,"SSI,TANF",true,Part-time,4.0,Medicaid,Some comment,#{family1.created_at},#{family1.updated_at},#{partner.id},false
+        #{family2.id},Mark,Smith,90210,Jefferson,416-555-0987,Jane Smith,1,2,2,TANF,false,Part-time,4.0,Medicaid,Some comment 2,#{family2.created_at},#{family2.updated_at},#{partner.id},true
       CSV
       expect(response.body).to eq(csv)
     end
diff --git a/spec/requests/partners/profiles_requests_spec.rb b/spec/requests/partners/profiles_requests_spec.rb
new file mode 100644
index 0000000000..4c7c7e3f1a
--- /dev/null
+++ b/spec/requests/partners/profiles_requests_spec.rb
@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe "/partners/profiles", type: :request do
+  let(:partner) { create(:partner, name: "Partnerrific") }
+  let(:partner_user) { partner.primary_user }
+
+  before do
+    sign_in(partner_user)
+  end
+
+  describe "GET #show" do
+    it "displays the partner" do
+      get partners_profile_path(partner)
+      expect(response.body).to include("Partnerrific")
+    end
+  end
+
+  describe "GET #edit" do
+    it "displays the partner" do
+      get edit_partners_profile_path(partner)
+      expect(response.body).to include("Partnerrific")
+    end
+  end
+
+  describe "PUT #update" do
+    it "updates the partner and profile" do
+      partner.profile.update!(address1: "123 Main St.", address2: "New York, New York")
+      put partners_profile_path(partner,
+        partner: {name: "Partnerdude"},
+        profile: {address1: "456 Main St.", address2: "Washington, DC"})
+      expect(partner.reload.name).to eq("Partnerdude")
+      expect(partner.profile.reload.address1).to eq("456 Main St.")
+      expect(partner.profile.address2).to eq("Washington, DC")
+      expect(response).to redirect_to(partners_profile_path)
+    end
+  end
+end
diff --git a/spec/requests/partners/requests_spec.rb b/spec/requests/partners/requests_spec.rb
index 70d732caa5..a12c4fb603 100644
--- a/spec/requests/partners/requests_spec.rb
+++ b/spec/requests/partners/requests_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe "/partners/requests", type: :request do
   describe "GET #index" do
     subject { -> { get partners_requests_path } }
-    let(:partner_user) { Partners::Partner.find_by(partner_id: partner.id).primary_user }
+    let(:partner_user) { partner.primary_user }
     let(:partner) { create(:partner) }
 
     before do
@@ -18,7 +18,7 @@
 
   describe "GET #new" do
     subject { -> { get new_partners_request_path } }
-    let(:partner_user) { Partners::Partner.find_by(partner_id: partner.id).primary_user }
+    let(:partner_user) { partner.primary_user }
     let(:partner) { create(:partner) }
 
     before do
@@ -39,8 +39,8 @@
   end
 
   describe "POST #create" do
-    subject { -> { post partners_requests_path, params: { partners_request: partners_request_attributes } } }
-    let(:partners_request_attributes) do
+    subject { -> { post partners_requests_path, params: { request: request_attributes } } }
+    let(:request_attributes) do
       {
         comments: Faker::Lorem.paragraph,
         item_requests_attributes: {
@@ -51,7 +51,7 @@
         }
       }
     end
-    let(:partner_user) { Partners::Partner.find_by(partner_id: partner.id).primary_user }
+    let(:partner_user) { partner.primary_user }
     let(:partner) { create(:partner) }
 
     before do
@@ -59,7 +59,7 @@
     end
 
     context 'when given valid parameters' do
-      let(:partners_request_attributes) do
+      let(:request_attributes) do
         {
           comments: Faker::Lorem.paragraph,
           item_requests_attributes: {
@@ -73,12 +73,12 @@
 
       it 'should redirect to the show page' do
         subject.call
-        expect(response).to redirect_to(partners_request_path(Partners::Request.last.id))
+        expect(response).to redirect_to(partners_request_path(Request.last.id))
       end
     end
 
     context 'when given invalid parameters' do
-      let(:partners_request_attributes) do
+      let(:request_attributes) do
         {
           comments: ""
         }
diff --git a/spec/requests/partners/user_requests_spec.rb b/spec/requests/partners/user_requests_spec.rb
index 7159678ff1..60447e3821 100644
--- a/spec/requests/partners/user_requests_spec.rb
+++ b/spec/requests/partners/user_requests_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe "/partners/users", type: :request do
   let(:partner) { create(:partner) }
-  let(:partner_user) { Partners::Partner.find_by(partner_id: partner.id).primary_user }
+  let(:partner_user) { partner.primary_user }
 
   before do
     sign_in(partner_user)
diff --git a/spec/requests/partners_requests_spec.rb b/spec/requests/partners_requests_spec.rb
index 40ae2d12d7..4f38abd68d 100644
--- a/spec/requests/partners_requests_spec.rb
+++ b/spec/requests/partners_requests_spec.rb
@@ -48,8 +48,8 @@
         expect { subject.call }.to change { Partner.all.count }.by(1)
       end
 
-      it 'should create a new Partners::Partner record' do
-        expect { subject.call }.to change { Partners::Partner.all.count }.by(1)
+      it 'should create a new Partners::Profile record' do
+        expect { subject.call }.to change { Partners::Profile.all.count }.by(1)
       end
 
       it 'redirect to the partners index page' do
@@ -71,8 +71,8 @@
         expect { subject.call }.not_to change { Partner.all.count }
       end
 
-      it 'should not create a new Partners::Partner record' do
-        expect { subject.call }.not_to change { Partners::Partner.all.count }
+      it 'should not create a new Partners::Profile record' do
+        expect { subject.call }.not_to change { Partners::Profile.all.count }
       end
 
       it 'should display the error message' do
@@ -89,9 +89,9 @@
     end
 
     let(:partner) { create(:partner, organization: @organization, status: :approved) }
-    let!(:family1) { FactoryBot.create(:partners_family, guardian_zip_code: '45612-123', partner: partner.profile) }
-    let!(:family2) { FactoryBot.create(:partners_family, guardian_zip_code: '45612-126', partner: partner.profile) }
-    let!(:family3) { FactoryBot.create(:partners_family, guardian_zip_code: '45612-123', partner: partner.profile) }
+    let!(:family1) { FactoryBot.create(:partners_family, guardian_zip_code: '45612-123', partner: partner) }
+    let!(:family2) { FactoryBot.create(:partners_family, guardian_zip_code: '45612-126', partner: partner) }
+    let!(:family3) { FactoryBot.create(:partners_family, guardian_zip_code: '45612-123', partner: partner) }
 
     let!(:child1) { FactoryBot.create_list(:partners_child, 2, family: family1) }
     let!(:child2) { FactoryBot.create_list(:partners_child, 2, family: family3) }
@@ -132,7 +132,7 @@
         context 'when the partner has no users' do
           # see the deletable? method which is tested separately in the partner model spec
           it 'shows the delete button' do
-            partner.profile.users.each(&:destroy)
+            partner.users.each(&:destroy)
             expect(subject.body).to include('Delete')
           end
         end
@@ -366,10 +366,10 @@
     context "when the partner successfully reactivates" do
       let(:partner) { create(:partner, organization: @organization, status: "deactivated") }
 
-      it "changes the partner status to approved, partner status on partner app to verified, and redirects with flash" do
+      it "changes the partner status to approved and redirects with flash" do
         put reactivate_partner_path(default_params.merge(id: partner.id))
 
-        expect(partner.reload.status).to eq("approved")
+        expect(partner.reload.status).to eq('approved')
         expect(response).to redirect_to(partners_path)
         expect(flash[:notice]).to eq("#{partner.name} successfully reactivated!")
       end
diff --git a/spec/requests/profiles_requests_spec.rb b/spec/requests/profiles_requests_spec.rb
index 000402abbb..bd53118f80 100644
--- a/spec/requests/profiles_requests_spec.rb
+++ b/spec/requests/profiles_requests_spec.rb
@@ -18,19 +18,19 @@
 
   describe "POST #update" do
     context "successful save" do
-      profiles_params = { name: "Awesome Partner", executive_director_email: "awesomepartner@example.com", facebook: "facebooksucks" }
+      partner_params = { name: "Awesome Partner" }
+      profiles_params = { executive_director_email: "awesomepartner@example.com", facebook: "facebooksucks" }
 
       it "update partner" do
-        put profile_path(default_params.merge(id: partner, partners_partner: profiles_params))
+        put profile_path(default_params.merge(id: partner, partner: partner_params, profile: profiles_params))
         expect(response).to have_http_status(:redirect)
-        partnerbase = partner.profile
-        expect(partnerbase.name).to eq("Awesome Partner")
-        expect(partnerbase.executive_director_email).to eq("awesomepartner@example.com")
-        expect(partnerbase.facebook).to eq("facebooksucks")
+        expect(partner.reload.name).to eq("Awesome Partner")
+        expect(partner.profile.reload.executive_director_email).to eq("awesomepartner@example.com")
+        expect(partner.profile.facebook).to eq("facebooksucks")
       end
 
       it "redirects to #show" do
-        put profile_path(default_params.merge(id: partner, partners_partner: profiles_params))
+        put profile_path(default_params.merge(id: partner, partner: partner_params, profile: profiles_params))
         expect(response).to redirect_to(partner_path(partner) + "#partner-information")
       end
     end
diff --git a/spec/requests/users_requests_spec.rb b/spec/requests/users_requests_spec.rb
index 4f4e4ba85a..835e9f61b1 100644
--- a/spec/requests/users_requests_spec.rb
+++ b/spec/requests/users_requests_spec.rb
@@ -31,7 +31,7 @@
     end
     context "with a partner role" do
       it "should redirect to the partner path" do
-        @user.add_role(Role::PARTNER, Partners::Partner.find_by(partner_id: partner.id))
+        @user.add_role(Role::PARTNER, partner)
         get switch_to_role_users_path(@organization,
           role_id: @user.roles.find { |r| r.name == Role::PARTNER.to_s })
         # all bank controllers add organization_id to all routes - there's no way to
diff --git a/spec/services/organization_update_service_spec.rb b/spec/services/organization_update_service_spec.rb
index eee592a1db..64f0d23c6a 100644
--- a/spec/services/organization_update_service_spec.rb
+++ b/spec/services/organization_update_service_spec.rb
@@ -70,52 +70,4 @@
       end
     end
   end
-
-  describe "sync_visible_partner_form_sections" do
-    subject do
-      described_class.sync_visible_partner_form_sections(organization)
-    end
-
-    context "when partner_form_fields have not changed" do
-      before do
-        expect(Partners::PartnerForm.where(essentials_bank_id: organization.id).count).to eq(0)
-      end
-
-      it "should not make any changes" do
-        expect { subject }.not_to change {
-          Partners::PartnerForm.where(essentials_bank_id: organization.id).count
-        }
-      end
-    end
-
-    context "when the partner_form_fields change" do
-      let(:partner_fields) { Organization::ALL_PARTIALS.map { |t| t[0] }.sample(3) }
-      before do
-        organization.partner_form_fields = partner_fields
-        organization.save!
-      end
-
-      context "and a Partners::PartnerForm does not exist yet" do
-        before do
-          expect(Partners::PartnerForm.where(essentials_bank_id: organization.id).count).to eq(0)
-        end
-
-        it "should create or update the new partner form with the correct section values" do
-          expect { subject }.to change {
-            Partners::PartnerForm.where(essentials_bank_id: organization.id, sections: organization.partner_form_fields).count
-          }.by(1)
-        end
-      end
-
-      context "and a Partners::PartnerForm already exists" do
-        let!(:existing_partner_form) { Partners::PartnerForm.new(essentials_bank_id: organization.id, sections: []).tap(&:save!) }
-
-        it "should update the existing partner form" do
-          expect { subject }.to change {
-            existing_partner_form.reload.sections
-          }.to(partner_fields)
-        end
-      end
-    end
-  end
 end
diff --git a/spec/services/partner_approval_service_spec.rb b/spec/services/partner_approval_service_spec.rb
index 1723787ceb..bab3a2f4d8 100644
--- a/spec/services/partner_approval_service_spec.rb
+++ b/spec/services/partner_approval_service_spec.rb
@@ -39,10 +39,6 @@
         expect { subject }.to change { partner.reload.approved? }.from(false).to(true)
       end
 
-      it 'should change the partner profile partner_status' do
-        expect { subject }.to change { partner_profile.reload.partner_status }.to(Partners::Partner::VERIFIED_STATUS)
-      end
-
       it 'should send an email notification to the partner' do
         subject
         expect(fake_mailer).to have_received(:deliver_later)
@@ -64,10 +60,6 @@
             expect { subject }.not_to change { partner.reload.approved? }
           end
 
-          it 'should not change the partner_profile partner_status' do
-            expect { subject }.not_to change { partner_profile.reload.partner_status }
-          end
-
           it 'should not send an email notification to the partner' do
             subject
             expect(fake_mailer).to_not have_received(:deliver_later)
diff --git a/spec/services/partner_create_service_spec.rb b/spec/services/partner_create_service_spec.rb
index 22b60cd7d2..a747e68694 100644
--- a/spec/services/partner_create_service_spec.rb
+++ b/spec/services/partner_create_service_spec.rb
@@ -38,7 +38,7 @@
       end
 
       it 'should create the associated partner profile data' do
-        query = Partners::Partner.where(name: partner_attrs[:name])
+        query = Partners::Profile.joins(:partner).where(partners: {name: partner_attrs[:name]})
         expect { subject }.to change { query.count }.from(0).to(1)
         expect(query.first.enable_child_based_requests).to eq(false)
         expect(query.first.enable_individual_requests).to eq(false)
@@ -48,9 +48,9 @@
       context 'but there was an unexpected issue with saving the' do
         let(:error_message) { Faker::Games::ElderScrolls.dragon }
 
-        context 'Partners::Partner record' do
+        context 'Partners::Profile record' do
           before do
-            allow(Partners::Partner).to receive(:create!).and_raise(error_message)
+            allow(Partners::Profile).to receive(:create!).and_raise(error_message)
           end
 
           it 'should not create the partner record for the organization' do
diff --git a/spec/services/partner_invite_service_spec.rb b/spec/services/partner_invite_service_spec.rb
index 1f9e501e10..35b7b525f8 100644
--- a/spec/services/partner_invite_service_spec.rb
+++ b/spec/services/partner_invite_service_spec.rb
@@ -6,7 +6,7 @@
 
   context 'when the user has already been invited' do
     before do
-      expect(partner.profile.primary_user).not_to eq(nil)
+      expect(partner.primary_user).not_to eq(nil)
     end
 
     it 'should return an error saying they are invited already' do
@@ -17,8 +17,8 @@
   context 'when the user has not been invited yet' do
     let(:partner) do
       partner = create(:partner, :uninvited)
-      partner.profile.primary_user.delete
-      partner.profile.reload
+      partner.primary_user.delete
+      partner.reload
       partner
     end
 
@@ -37,7 +37,7 @@
       expect(UserInviteService).to have_received(:invite).with(
         email: partner.email,
         roles: [Role::PARTNER],
-        resource: partner.profile
+        resource: partner
       )
     end
   end
diff --git a/spec/services/partner_request_recertification_service_spec.rb b/spec/services/partner_request_recertification_service_spec.rb
index 3e9130b9e6..1ea80658f1 100644
--- a/spec/services/partner_request_recertification_service_spec.rb
+++ b/spec/services/partner_request_recertification_service_spec.rb
@@ -39,10 +39,6 @@
         expect { subject }.to change { partner.reload.recertification_required? }.from(false).to(true)
       end
 
-      it 'should change the partner profile partner_status' do
-        expect { subject }.to change { partner_profile.reload.partner_status }.to(Partners::Partner::RECERTIFICATION_REQUESTED_STATUS)
-      end
-
       it 'should queue sending the notice to the partner' do
         subject
         expect(fake_recertification_request).to have_received(:deliver_later)
@@ -64,10 +60,6 @@
             expect { subject }.not_to change { partner.reload.approved? }
           end
 
-          it 'should not change the partner_profile partner_status' do
-            expect { subject }.not_to change { partner_profile.reload.partner_status }
-          end
-
           it 'should NOT queue sending the notice to the partner' do
             subject
             expect(fake_recertification_request).not_to have_received(:deliver_later)
diff --git a/spec/services/partners/family_request_create_service_spec.rb b/spec/services/partners/family_request_create_service_spec.rb
index a689b1b826..53cf376ac4 100644
--- a/spec/services/partners/family_request_create_service_spec.rb
+++ b/spec/services/partners/family_request_create_service_spec.rb
@@ -11,7 +11,7 @@
         family_requests_attributes: family_requests_attributes
       }
     end
-    let(:partner_user) { partner.primary_partner_user }
+    let(:partner_user) { partner.primary_user }
     let(:partner) { create(:partner) }
     let(:comments) { Faker::Lorem.paragraph }
     let(:for_families) { false }
@@ -66,19 +66,16 @@
           ]
         end
 
-        it 'should create the appropriate organization ::Request, Partners::Request, Partners::ItemRequest and Partners::ChildItemRequests' do
+        it 'should create the appropriate organization Request, Partners::ItemRequest and Partners::ChildItemRequests' do
           expect do
             subject
-          end.to change { ::Request.count }
-            .by(1)
-            .and change { Partners::Request.count }
+          end.to change { Request.count }
             .by(1)
 
-          expect(::Request.last.request_items.map { |item| item["item_id"] }).to match_array(items_to_request.pluck(:id))
+          expect(Request.last.request_items.map { |item| item["item_id"] }).to match_array(items_to_request.pluck(:id))
 
-          partner_request = Partners::Request.last
+          partner_request = Request.last
           expect(partner_request.item_requests.count).to eq(2)
-          expect(partner_request).to_not be_for_families
 
           first_item_request = partner_request.item_requests.find_by(item_id: first_item_id)
           expect(first_item_request.children).to contain_exactly(child1)
@@ -86,16 +83,6 @@
           second_item_request = partner_request.item_requests.find_by(item_id: second_item_id)
           expect(second_item_request.children).to contain_exactly(child1, child2)
         end
-
-        context 'with for_families = true' do
-          let(:for_families) { true }
-
-          it 'set for_families on the partner_request' do
-            subject
-            partner_request = Partners::Request.last
-            expect(partner_request).to be_for_families
-          end
-        end
       end
 
       context 'without children' do
diff --git a/spec/services/partners/request_approval_service_spec.rb b/spec/services/partners/request_approval_service_spec.rb
index 3ef67de565..51fda25513 100644
--- a/spec/services/partners/request_approval_service_spec.rb
+++ b/spec/services/partners/request_approval_service_spec.rb
@@ -11,7 +11,7 @@
 
     context 'when the partner is already awaiting approval' do
       before do
-        partner.profile.update!(partner_status: 'submitted')
+        partner.update!(status: 'awaiting_review')
       end
 
       it 'should return an error saying it the partner is already requested approval' do
@@ -23,11 +23,7 @@
       let(:fake_mailer) { double('fake_mailer', deliver_later: -> {}) }
       before do
         allow(OrganizationMailer).to receive(:partner_approval_request).with(partner: partner, organization: partner.organization).and_return(fake_mailer)
-        expect(partner.profile.partner_status).not_to eq('submitted')
-      end
-
-      it 'should set the partner_status of the partner profile to submitted' do
-        expect { subject }.to change { partner.profile.reload.partner_status }.to('submitted')
+        expect(partner.status).not_to eq(:awaiting_review)
       end
 
       it 'should set the status on the partner record to awaiting_review' do
diff --git a/spec/services/partners/request_create_service_spec.rb b/spec/services/partners/request_create_service_spec.rb
index 62d2877dce..aad585c2d1 100644
--- a/spec/services/partners/request_create_service_spec.rb
+++ b/spec/services/partners/request_create_service_spec.rb
@@ -7,11 +7,10 @@
       {
         partner_user_id: partner_user.id,
         comments: comments,
-        item_requests_attributes: item_requests_attributes,
-        additional_attrs: additional_attrs
+        item_requests_attributes: item_requests_attributes
       }
     end
-    let(:partner_user) { partner.primary_partner_user }
+    let(:partner_user) { partner.primary_user }
     let(:partner) { create(:partner) }
     let(:comments) { Faker::Lorem.paragraph }
     let(:item_requests_attributes) do
@@ -22,14 +21,13 @@
         )
       ]
     end
-    let(:additional_attrs) { { for_families: true } }
 
     context 'when the arguments are incorrect' do
       context 'because no item_requests_attributes and comments were defined' do
         let(:item_requests_attributes) { [] }
         let(:comments) { "" }
 
-        it 'should return the Partners::Request object with an error' do
+        it 'should return the Request object with an error' do
           result = subject
 
           expect(result).to be_a_kind_of(Partners::RequestCreateService)
@@ -47,7 +45,7 @@
           ]
         end
 
-        it 'should return the Partners::Request object with an error' do
+        it 'should return the Request object with an error' do
           result = subject
 
           expect(result).to be_a_kind_of(Partners::RequestCreateService)
@@ -77,7 +75,7 @@
       end
 
       before do
-        allow(Organization).to receive(:find_by).with(id: partner_user.partner.essentials_bank_id).and_return(
+        allow(Organization).to receive(:find_by).with(id: partner_user.partner.organization_id).and_return(
           double(Organization, valid_items: fake_organization_valid_items)
         )
         allow(NotifyPartnerJob).to receive(:perform_now)
@@ -87,15 +85,6 @@
         expect(subject.errors).to be_empty
       end
 
-      it 'should create a sent Partners::Request record' do
-        expect { subject }.to change { Partners::Request.where(sent: true).count }.by(1)
-      end
-
-      it 'should set the additional_attrs provided' do
-        subject
-        expect(Partners::Request.last.for_families).to eq(true)
-      end
-
       it 'should create a Request record' do
         expect { subject }.to change { Request.count }.by(1)
       end
@@ -108,29 +97,6 @@
       context 'but a unexpected error occured during the save' do
         let(:error_message) { 'boom' }
 
-        context 'for the Partners::Request request' do
-          before do
-            allow_any_instance_of(Partners::Request).to receive(:save!).and_raise(error_message)
-          end
-
-          it 'should have an error with the raised error' do
-            expect(subject.errors[:base]).to eq([error_message])
-          end
-
-          it 'should NOT create a Partners::Request record' do
-            expect { subject }.not_to change { Partners::Request.count }
-          end
-
-          it 'should NOT create a Request record' do
-            expect { subject }.not_to change { Request.count }
-          end
-
-          it 'should NOT notify the Partner via email' do
-            subject
-            expect(NotifyPartnerJob).not_to have_received(:perform_now)
-          end
-        end
-
         context 'for the Request record' do
           before do
             allow_any_instance_of(Request).to receive(:save!).and_raise(error_message)
@@ -140,10 +106,6 @@
             expect(subject.errors[:base]).to eq([error_message])
           end
 
-          it 'should NOT create a Partners::Request record' do
-            expect { subject }.not_to change { Partners::Request.count }
-          end
-
           it 'should NOT create a Request record' do
             expect { subject }.not_to change { Request.count }
           end
diff --git a/spec/services/reports/partner_info_report_service_spec.rb b/spec/services/reports/partner_info_report_service_spec.rb
index 0e58e40dc9..3f8a88dc1a 100644
--- a/spec/services/reports/partner_info_report_service_spec.rb
+++ b/spec/services/reports/partner_info_report_service_spec.rb
@@ -18,11 +18,11 @@
 
     it 'should report normal values' do
       p1 = create(:partner, :uninvited, organization: organization, name: 'Partner 1')
-      p1.profile.update!(zips_served: '90210-1234', agency_type: Partners::Partner::AGENCY_TYPES['CAREER'])
+      p1.profile.update!(zips_served: '90210-1234', agency_type: Partner::AGENCY_TYPES['CAREER'])
       p2 = create(:partner, :uninvited, organization: organization, name: 'Partner 2')
-      p2.profile.update!(zips_served: '12345', agency_type: Partners::Partner::AGENCY_TYPES['CAREER'])
+      p2.profile.update!(zips_served: '12345', agency_type: Partner::AGENCY_TYPES['CAREER'])
       p3 = create(:partner, :uninvited, organization: organization, name: 'Partner 3')
-      p3.profile.update!(zips_served: '09876-3564', agency_type: Partners::Partner::AGENCY_TYPES['EDU'])
+      p3.profile.update!(zips_served: '09876-3564', agency_type: Partner::AGENCY_TYPES['EDU'])
 
       expect(report.report).to eq({
                                     entries: { "Agency Type: Career technical training" => 2,
diff --git a/spec/system/partner_system_spec.rb b/spec/system/partner_system_spec.rb
index 039458100b..b5aab75375 100644
--- a/spec/system/partner_system_spec.rb
+++ b/spec/system/partner_system_spec.rb
@@ -10,7 +10,7 @@
       let!(:partner_awaiting_approval) { create(:partner, :awaiting_review) }
 
       before do
-        expect(partner_awaiting_approval.profile.partner_status).not_to eq('approval')
+        expect(partner_awaiting_approval.status).not_to eq(:approved)
       end
 
       context 'when the approval succeeds' do
@@ -25,7 +25,6 @@
           assert page.has_content? 'Partner approved!'
 
           expect(partner_awaiting_approval.reload.approved?).to eq(true)
-          expect(partner_awaiting_approval.profile.reload.partner_status).to eq(Partners::Partner::VERIFIED_STATUS)
         end
       end
 
@@ -47,7 +46,6 @@
           assert page.has_content? "Failed to approve partner because: #{fake_error_msg}"
 
           expect(partner_awaiting_approval.reload.approved?).to eq(false)
-          expect(partner_awaiting_approval.profile.reload.partner_status).not_to eq(Partners::Partner::VERIFIED_STATUS)
         end
       end
     end
@@ -153,7 +151,7 @@
 
       it "allows a user to invite a partner", js: true do
         partner = create(:partner, name: 'Charities')
-        partner.profile.primary_user.delete
+        partner.primary_user.delete
 
         visit url_prefix + "/partners"
 
@@ -352,7 +350,7 @@
       context "when viewing a partner's users" do
         subject { url_prefix + "/partners/#{partner.id}" }
         let(:partner) { create(:partner, name: "Partner") }
-        let(:partner_user) { partner.profile.users.first }
+        let(:partner_user) { partner.users.first }
         let(:invitation_sent_at) { partner_user.invitation_sent_at.to_formatted_s(:date_picker) }
         let(:last_sign_in_at) { partner_user.last_sign_in_at.to_formatted_s(:date_picker) }
 
diff --git a/spec/system/partners/approval_process_spec.rb b/spec/system/partners/approval_process_spec.rb
index 720d2b21cb..909f5daf6b 100644
--- a/spec/system/partners/approval_process_spec.rb
+++ b/spec/system/partners/approval_process_spec.rb
@@ -1,6 +1,6 @@
 RSpec.describe "Approval process for partners", type: :system, js: true do
   describe 'filling in organization details and requesting for approval' do
-    let(:partner_user) { partner.primary_partner_user }
+    let(:partner_user) { partner.primary_user }
     let!(:partner) { FactoryBot.create(:partner) }
 
     context 'GIVEN a partner user is new and wants to request approval' do
@@ -27,7 +27,7 @@
       context 'AND they fill out the form and submit it' do
         before do
           click_on 'My Organization'
-          assert page.has_content? 'pending'
+          assert page.has_content? 'Uninvited'
           click_on 'Update Information'
 
           fill_in 'Other Agency Type', with: 'Lorem'
@@ -43,7 +43,7 @@
 
           find_link(text: 'Submit for Approval').click
           assert page.has_content? 'You have submitted your details for approval.'
-          assert page.has_content? 'submitted'
+          assert page.has_content? 'Awaiting Review'
         end
 
         context 'THEN the organization approves them' do
@@ -55,7 +55,7 @@
           end
 
           it 'should show that they have been approved and able to make requests', :aggregate_failures do
-            assert page.has_content? 'verified'
+            assert page.has_content? 'Approved'
 
             visit partners_requests_path
             assert page.has_content? 'Make a request'
diff --git a/spec/system/partners/coworker_invitations_system_spec.rb b/spec/system/partners/coworker_invitations_system_spec.rb
index 6699ded243..9f096e1493 100644
--- a/spec/system/partners/coworker_invitations_system_spec.rb
+++ b/spec/system/partners/coworker_invitations_system_spec.rb
@@ -1,6 +1,6 @@
 RSpec.describe "Coworking invitations", type: :system, js: true do
   describe 'inviting a new user as a partner user' do
-    let(:partner_user) { partner.primary_partner_user }
+    let(:partner_user) { partner.primary_user }
     let!(:partner) { FactoryBot.create(:partner) }
 
     context 'GIVEN a partner user complete the process to invite a coworker' do
diff --git a/spec/system/partners/family_requests_system_spec.rb b/spec/system/partners/family_requests_system_spec.rb
index 67b5462833..e1030f284a 100644
--- a/spec/system/partners/family_requests_system_spec.rb
+++ b/spec/system/partners/family_requests_system_spec.rb
@@ -1,11 +1,11 @@
 RSpec.describe "Family requests", type: :system, js: true do
   let(:partner) { FactoryBot.create(:partner) }
-  let(:partner_user) { partner.primary_partner_user }
-  let(:family) { create(:partners_family, guardian_last_name: "Morales", partner: partner.profile) }
-  let(:other_family) { create(:partners_family, partner: partner.profile) }
+  let(:partner_user) { partner.primary_user }
+  let(:family) { create(:partners_family, guardian_last_name: "Morales", partner: partner) }
+  let(:other_family) { create(:partners_family, partner: partner) }
 
   before do
-    partner.profile.update(partner_status: :verified)
+    partner.update(status: :approved)
     login_as(partner_user)
   end
 
@@ -30,7 +30,6 @@
       expect(page).to have_text("Request History")
       expect(Partners::ChildItemRequest.pluck(:child_id)).to match_array(children.pluck(:id))
       expect(Partners::ItemRequest.pluck(:item_id)).to match_array(children.pluck(:item_needed_diaperid).uniq)
-      expect(Partners::Request.last.for_families?).to eq(true)
     end
   end
 
diff --git a/spec/system/partners/helps_system_spec.rb b/spec/system/partners/helps_system_spec.rb
index 530435fc4b..fcf8acc2ef 100644
--- a/spec/system/partners/helps_system_spec.rb
+++ b/spec/system/partners/helps_system_spec.rb
@@ -1,9 +1,9 @@
 RSpec.describe "Help", type: :system do
   let(:partner) { FactoryBot.create(:partner) }
-  let(:partner_user) { partner.primary_partner_user }
+  let(:partner_user) { partner.primary_user }
 
   before do
-    partner.profile.update(partner_status: :verified)
+    partner.update(status: :approved)
     login_as(partner_user)
   end
 
diff --git a/spec/system/partners/managing_requests_system_spec.rb b/spec/system/partners/managing_requests_system_spec.rb
index 7192a1d280..4feea69106 100644
--- a/spec/system/partners/managing_requests_system_spec.rb
+++ b/spec/system/partners/managing_requests_system_spec.rb
@@ -1,6 +1,6 @@
 RSpec.describe "Managing requests", type: :system, js: true do
   describe 'creating a individuals/family request' do
-    let(:partner_user) { partner.primary_partner_user }
+    let(:partner_user) { partner.primary_user }
     let!(:partner) { FactoryBot.create(:partner) }
 
     context 'GIVEN a partner user is permitted to make a request' do
@@ -22,7 +22,7 @@
       end
 
       context 'WHEN they create a request properly' do
-        let(:items_to_select) { Organization.find(partner_user.partner.essentials_bank_id).valid_items.sample(3) }
+        let(:items_to_select) { partner_user.partner.organization.valid_items.sample(3) }
         let(:item_details) do
           items_to_select.map do |item|
             default_quantity = Item.find(item[:id]).default_quantity
@@ -52,14 +52,14 @@
 
         context 'THEN a request records will be created and the partner will be notified via flash message on the dashboard' do
           before do
-            expect { click_button 'Submit Essentials Request' }.to change { Partners::Request.count + Request.count }.by(2)
+            expect { click_button 'Submit Essentials Request' }.to change { Request.count }.by(1)
 
-            expect(current_path).to eq(partners_request_path(Partners::Request.last.id))
+            expect(current_path).to eq(partners_request_path(Request.last.id))
             expect(page).to have_content('Request has been successfully created!')
           end
 
           it 'AND the partner_user can view the details of the created individuals request in a seperate page' do
-            visit partners_request_path(id: Partners::Request.last.id)
+            visit partners_request_path(id: Request.last.id)
 
             # Should have the proper quantity per each item.
             item_details.each do |item|
@@ -72,7 +72,7 @@
   end
 
   describe 'creating a request' do
-    let(:partner_user) { partner.primary_partner_user }
+    let(:partner_user) { partner.primary_user }
     let!(:partner) { FactoryBot.create(:partner) }
 
     context 'GIVEN a partner user is permitted to make a request' do
@@ -99,16 +99,16 @@
         end
 
         it 'should be created without any issue' do
-          expect { click_button 'Submit Essentials Request' }.to change { Partners::Request.count + Request.count }.by(2)
+          expect { click_button 'Submit Essentials Request' }.to change { Request.count }.by(1)
 
-          expect(current_path).to eq(partners_request_path(Partners::Request.last.id))
+          expect(current_path).to eq(partners_request_path(Request.last.id))
           expect(page).to have_content('Request has been successfully created!')
           expect(page).to have_content("#{partner.organization.name} should have received the request.")
         end
       end
 
       context 'WHEN they create a request properly' do
-        let(:items_to_select) { Organization.find(partner_user.partner.essentials_bank_id).valid_items.sample(3) }
+        let(:items_to_select) { partner_user.partner.organization.valid_items.sample(3) }
         let(:item_details) do
           items_to_select.map do |item|
             {
@@ -138,15 +138,15 @@
 
         context 'THEN a request records will be created and the partner will be notified via flash message on the dashboard' do
           before do
-            expect { click_button 'Submit Essentials Request' }.to change { Partners::Request.count + Request.count }.by(2)
+            expect { click_button 'Submit Essentials Request' }.to change { Request.count }.by(1)
 
-            expect(current_path).to eq(partners_request_path(Partners::Request.last.id))
+            expect(current_path).to eq(partners_request_path(Request.last.id))
             expect(page).to have_content('Request has been successfully created!')
             expect(page).to have_content("#{partner.organization.name} should have received the request.")
           end
 
           it 'AND the partner_user can view the details of the created request in a seperate page' do
-            visit partners_request_path(id: Partners::Request.last.id)
+            visit partners_request_path(id: Request.last.id)
 
             item_details.each do |item|
               expect(page).to have_content("#{item[:quantity]} of #{item[:name]}")
diff --git a/spec/system/partners/partner_distribution_system_spec.rb b/spec/system/partners/partner_distribution_system_spec.rb
index 5b6fca7587..a47a31421c 100644
--- a/spec/system/partners/partner_distribution_system_spec.rb
+++ b/spec/system/partners/partner_distribution_system_spec.rb
@@ -1,6 +1,6 @@
 RSpec.describe "Partner Distributions", type: :system, js: true do
   describe "Distributions" do
-    let(:partner_user) { partner.primary_partner_user }
+    let(:partner_user) { partner.primary_user }
     let(:date) { 1.week.from_now }
     let(:past_date) { 1.week.ago }
     let!(:partner) { FactoryBot.create(:partner) }
diff --git a/spec/system/sign_in_system_spec.rb b/spec/system/sign_in_system_spec.rb
index 764199660c..4f03c49ecf 100644
--- a/spec/system/sign_in_system_spec.rb
+++ b/spec/system/sign_in_system_spec.rb
@@ -30,7 +30,7 @@
   context 'when a partner user logs in' do
     it 'redirects to the partner page' do
       partner = create(:partner)
-      partner_user = create(:partners_user, partner: partner.profile)
+      partner_user = create(:partners_user, partner: partner)
       fill_in "Email", with: partner_user.email
       fill_in "user_password", with: partner_user.password
       click_button "Log in"