diff --git a/AGENTS.md b/AGENTS.md
index 4965990ed..4599b4c3b 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -77,6 +77,10 @@ AWBW Portal (Rails 8.1)
 | `Person` | Organization affiliates with contacts, addresses, sectors |
 | `Organization` | Groups with affiliations, addresses, logos via ActiveStorage |
 | `Report` | STI base class for MonthlyReport and WorkshopLog |
+| `Form` | Configurable forms with sections, conditional visibility, nested form fields |
+| `FormField` | Individual fields on a form with visibility, input type, and ordering |
+| `FormSubmission` | A person's submission of a form (replaces PersonForm) |
+| `FormAnswer` | A single answer within a form submission (replaces PersonFormFormField) |
 
 ### STI Models
 
@@ -152,6 +156,7 @@ end
 - `TaggingSearchService` — Search and filter tagging data
 - `PersonFromUserService` — Create Person from User account
 - `BulkInviteService` — Bulk send welcome instructions and reset created_at for users
+- `FormBuilderService` — Builds configurable forms from composable sections with per-field visibility
 - `ModelDeduper` — Deduplication logic
 - `NotificationServices::CreateNotification` — Notification creation
 - `NotificationServices::PersistDeliveredEmail` — Email delivery tracking
@@ -212,7 +217,7 @@ end
 - **Always use Tailwind CSS** utility classes for styling — do not write custom CSS unless absolutely necessary
 - Prefer Turbo for navigation and form submissions before reaching for Stimulus
 
-### Stimulus Controllers (32)
+### Stimulus Controllers (34)
 
 Key controllers:
 - `asset_picker` — Asset selection UI
@@ -225,6 +230,8 @@ Key controllers:
 - `optimistic_bookmark` — Instant bookmark UI feedback
 - `remote_select` — AJAX-powered select dropdown
 - `searchable_select` — Tom Select autocomplete
+- `chip_select` — Dynamically styles `<select>` elements as colored chips
+- `form_fields_sortable` — SortableJS drag-and-drop reordering for form fields with section-aware header moves
 - `sortable` — Drag-drop sorting (SortableJS)
 - `tabs` — Tab panel navigation
 - `rhino_source` — Rich text editor integration
diff --git a/CLAUDE.md b/CLAUDE.md
index 5f5220e75..0132abb6f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -168,8 +168,9 @@ bundle exec bundle-audit check --update
 
 ## Migrations
 
-- Name migration files using **UTC timestamps** (e.g., `20260228143000`), not sequential numbers (e.g., `20260228000007`)
-- Multiple branches adding migrations on the same date will collide if they use sequential numbering
+- Name migration files using **real UTC timestamps** with the current time (e.g., `20260228143052` for 14:30:52 UTC), not padded zeros (e.g., `20260228140000`) or sequential numbers (e.g., `20260228000007`)
+- The last 6 digits are HHMMSS — use the actual current time, not `000000` or rounded values
+- Multiple branches adding migrations on the same date will collide if they use sequential or zero-padded numbering
 
 ## Git
 
diff --git a/app/controllers/events/public_registrations_controller.rb b/app/controllers/events/public_registrations_controller.rb
index a8a70284f..3c37df889 100644
--- a/app/controllers/events/public_registrations_controller.rb
+++ b/app/controllers/events/public_registrations_controller.rb
@@ -83,18 +83,14 @@ def show
         return
       end
 
-      @person_form = @form.person_forms.find_by(person: person)
-      unless @person_form
+      @form_submission = @form.form_submissions.find_by(person: person)
+      unless @form_submission
         redirect_to event_path(@event), alert: "No registration form submission found."
         return
       end
 
-      @form_fields = if registration&.scholarship_requested?
-        @form.form_fields.where(status: :active).where.not(field_group: "payment").reorder(position: :asc)
-      else
-        @form.form_fields.where(status: :active).where.not(field_group: "scholarship").reorder(position: :asc)
-      end
-      @responses = @person_form.person_form_form_fields.index_by(&:form_field_id)
+      @form_fields = @form.form_fields.reorder(position: :asc)
+      @responses = @form_submission.form_answers.index_by(&:form_field_id)
       @event = @event.decorate
     end
 
@@ -113,15 +109,116 @@ def scholarship_mode?
     end
 
     def visible_form_fields
-      scope = @form.form_fields.where(status: :active)
-      if scholarship_mode?
-        scope = scope.where.not(field_group: "payment")
-      else
-        scope = scope.where.not(field_group: "scholarship")
+      scope = @form.form_fields
+
+      unless scholarship_mode?
+        scope = scope.where.not(visibility: :scholarship_only)
       end
+
+      person = current_user&.person
+      if person
+        # Always hide logged_out_only fields for logged-in users with known data
+        known_identifiers = person_known_identifiers(person)
+        if known_identifiers.any?
+          known_ids = @form.form_fields
+                           .where(visibility: :logged_out_only, field_identifier: known_identifiers)
+                           .ids
+          scope = scope.where.not(id: known_ids) if known_ids.any?
+        end
+
+        # Hide logged_out_only headers when all their non-header fields are hidden
+        logged_out_sections = @form.form_fields.where(visibility: :logged_out_only)
+                                  .where.not(answer_type: :group_header)
+                                  .pluck(:section).uniq.compact
+        logged_out_sections.each do |sect|
+          section_field_ids = @form.form_fields.where(section: sect, visibility: :logged_out_only)
+                                  .where.not(answer_type: :group_header).ids
+          if section_field_ids.any? && known_identifiers.any? && (section_field_ids - scope.where(id: section_field_ids).ids).any?
+            remaining = scope.where(id: section_field_ids).ids
+            if remaining.empty?
+              scope = scope.where.not(section: sect, answer_type: :group_header, visibility: :logged_out_only)
+            end
+          end
+        end
+
+        if @form.hide_answered_form_questions?
+          answered_field_ids = []
+
+          # One-time fields: hide if answered on ANY form submission for this person
+          one_time_field_ids = @form.form_fields.where(visibility: :answers_on_file, one_time: true)
+                                   .where.not(answer_type: :group_header).ids
+          if one_time_field_ids.any?
+            answered_one_time = FormAnswer.joins(:form_submission)
+                                         .where(form_submissions: { person_id: person.id })
+                                         .where(form_field_id: one_time_field_ids)
+                                         .where.not(submitted_answer: [ nil, "" ])
+                                         .pluck(:form_field_id)
+            answered_field_ids.concat(answered_one_time)
+          end
+
+          # Regular fields: hide if answered on forms within this event
+          event_form_ids = @event.forms.ids
+          event_submissions = FormSubmission.where(person: person, form_id: event_form_ids)
+          if event_submissions.exists?
+            regular_field_ids = @form.form_fields.where(visibility: :answers_on_file, one_time: false)
+                                     .where.not(answer_type: :group_header).ids
+            if regular_field_ids.any?
+              answered_regular = FormAnswer.where(form_submission: event_submissions)
+                                          .where(form_field_id: regular_field_ids)
+                                          .where.not(submitted_answer: [ nil, "" ])
+                                          .pluck(:form_field_id)
+              answered_field_ids.concat(answered_regular)
+            end
+          end
+
+          answered_field_ids.uniq!
+          if answered_field_ids.any?
+            scope = scope.where.not(id: answered_field_ids)
+
+            # Hide section headers when all their non-header fields are answered
+            answered_sections = @form.form_fields.where(id: answered_field_ids)
+                                    .pluck(:section).uniq.compact
+            answered_sections.each do |sect|
+              section_field_ids = @form.form_fields.where(section: sect, visibility: :answers_on_file)
+                                      .where.not(answer_type: :group_header).ids
+              if section_field_ids.any? && (section_field_ids - answered_field_ids).empty?
+                scope = scope.where.not(section: sect, answer_type: :group_header, visibility: :answers_on_file)
+              end
+            end
+          end
+        end
+      end
+
       scope.reorder(position: :asc)
     end
 
+    def person_known_identifiers(person)
+      keys = []
+      keys << "first_name" if person.first_name.present?
+      keys << "last_name" if person.last_name.present?
+      keys << "primary_email" << "confirm_email" if person.email.present?
+      keys << "primary_email_type" if person.email_type.present?
+      keys << "nickname" if person.legal_first_name.present? || person.first_name.present?
+      keys << "pronouns" if person.pronouns.present?
+      keys << "secondary_email" if person.email_2.present?
+      keys << "secondary_email_type" if person.email_2_type.present?
+
+      if person.addresses.exists?
+        address = person.addresses.find_by(primary: true) || person.addresses.first
+        keys << "mailing_street" if address.street_address.present?
+        keys << "mailing_address_type" if address.address_type.present?
+        keys << "mailing_city" if address.city.present?
+        keys << "mailing_state" if address.state.present?
+        keys << "mailing_zip" if address.zip_code.present?
+      end
+
+      if person.contact_methods.where(kind: :phone).exists?
+        keys << "phone" << "phone_type"
+      end
+
+      keys
+    end
+
     def ensure_registerable
       unless @event.registerable?
         redirect_to event_path(@event), alert: "Registration is closed for this event."
@@ -131,14 +228,14 @@ def ensure_registerable
     def validate_required_fields(form_params)
       errors = {}
       fields = visible_form_fields
-      fields_by_key = fields.select { |f| f.field_key.present? }.index_by(&:field_key)
+      fields_by_identifier = fields.select { |f| f.field_identifier.present? }.index_by(&:field_identifier)
 
       fields.find_each do |field|
         next if field.group_header?
 
         value = form_params[field.id.to_s]
 
-        if field.is_required && (value.blank? || (value.is_a?(Array) && value.reject(&:blank?).empty?))
+        if field.required && (value.blank? || (value.is_a?(Array) && value.reject(&:blank?).empty?))
           errors[field.id] = "can't be blank"
           next
         end
@@ -147,13 +244,13 @@ def validate_required_fields(form_params)
 
         if field.number_integer? && value.to_s !~ /\A\d+\z/
           errors[field.id] = "must be a whole number"
-        elsif field.field_key&.match?(/email(?!_type)/) && value.to_s !~ /\A[^@\s]+@[^@\s]+\z/
+        elsif field.field_identifier&.match?(/email(?!_type|_confirmation)/) && value.to_s !~ /\A[^@\s]+@[^@\s]+\z/
           errors[field.id] = "must be a valid email address"
         end
       end
 
-      confirm_field = fields_by_key["confirm_email"]
-      email_field = fields_by_key["primary_email"]
+      confirm_field = fields_by_identifier["confirm_email"]
+      email_field = fields_by_identifier["primary_email"]
       if confirm_field && email_field && errors[confirm_field.id].nil?
         confirm_value = form_params[confirm_field.id.to_s].to_s.strip
         email_value = form_params[email_field.id.to_s].to_s.strip
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index c043b3f52..7c65b82bd 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -199,7 +199,7 @@ def assign_event_forms(event)
       end
     end
 
-    scholarship_form = Form.standalone.find_by(name: ScholarshipApplicationFormBuilder::FORM_NAME)
+    scholarship_form = Form.standalone.scholarship_application.first
     if scholarship_form && event.cost_cents.to_i > 0
       event.event_forms.find_or_create_by!(form: scholarship_form, role: "scholarship")
     elsif event.cost_cents.to_i == 0
diff --git a/app/controllers/forms_controller.rb b/app/controllers/forms_controller.rb
new file mode 100644
index 000000000..4d95a6709
--- /dev/null
+++ b/app/controllers/forms_controller.rb
@@ -0,0 +1,126 @@
+class FormsController < ApplicationController
+  before_action :set_form, only: %i[show edit update destroy reorder_field reorder_fields edit_sections update_sections]
+
+  def index
+    authorize!
+    @forms = Form.standalone.order(:name)
+  end
+
+  def show
+    authorize! @form
+    @form_fields = preview_form_fields
+  end
+
+  def new
+    authorize!
+  end
+
+  def create
+    authorize!
+
+    sections = (params[:sections] || []).reject(&:blank?).map(&:to_sym)
+    if sections.empty?
+      flash.now[:alert] = "Please select at least one section."
+      render :new, status: :unprocessable_content
+      return
+    end
+
+    form = FormBuilderService.new(
+      name: params[:name].presence || "New Form",
+      sections: sections,
+      scholarship_application: params[:scholarship_application] == "1"
+    ).call
+
+    redirect_to edit_form_path(form), notice: "Form created with #{form.form_fields.size} fields."
+  end
+
+  def edit
+    authorize! @form
+    @form_fields = @form.form_fields.reorder(position: :asc)
+  end
+
+  def update
+    authorize! @form
+
+    if @form.update(form_params)
+      redirect_to edit_form_path(@form), notice: "Form updated."
+    else
+      @form_fields = @form.form_fields.reorder(position: :asc)
+      render :edit, status: :unprocessable_content
+    end
+  end
+
+  def destroy
+    authorize! @form
+    @form.destroy!
+    redirect_to forms_path, notice: "Form deleted."
+  end
+
+  def edit_sections
+    authorize! @form
+  end
+
+  def update_sections
+    authorize! @form
+
+    sections = (params[:sections] || []).reject(&:blank?).map(&:to_sym)
+    if sections.empty?
+      flash.now[:alert] = "Please select at least one section."
+      render :edit_sections, status: :unprocessable_content
+      return
+    end
+
+    FormBuilderService.update_sections!(@form, sections)
+    redirect_to edit_form_path(@form), notice: "Sections updated."
+  end
+
+  def reorder_field
+    authorize! @form
+    field = @form.form_fields.find(params[:field_id])
+    field.update!(position: params[:position].to_i)
+    head :ok
+  end
+
+  def reorder_fields
+    authorize! @form
+    positions = JSON.parse(request.body.read)["positions"] || []
+    positions.each do |item|
+      @form.form_fields.where(id: item["id"]).update_all(position: item["position"])
+    end
+    head :ok
+  end
+
+  private
+
+  def set_form
+    @form = Form.find(params[:id])
+  end
+
+  def preview_form_fields
+    scope = @form.form_fields
+
+    unless params[:preview_scholarship].present?
+      scope = scope.where.not(visibility: :scholarship_only)
+    end
+
+    if params[:preview_logged_in].present?
+      scope = scope.where.not(visibility: :logged_out_only)
+    end
+
+    if params[:preview_answered].present?
+      scope = scope.where.not(visibility: :answers_on_file)
+    end
+
+    scope.reorder(position: :asc)
+  end
+
+  def form_params
+    params.require(:form).permit(
+      :name, :hide_answered_person_questions, :hide_answered_form_questions,
+      form_fields_attributes: [
+        :id, :name, :answer_type, :required, :hint_text,
+        :field_identifier, :section, :position, :visibility, :one_time, :_destroy
+      ]
+    )
+  end
+end
diff --git a/app/frontend/javascript/controllers/chip_select_controller.js b/app/frontend/javascript/controllers/chip_select_controller.js
new file mode 100644
index 000000000..575e90682
--- /dev/null
+++ b/app/frontend/javascript/controllers/chip_select_controller.js
@@ -0,0 +1,32 @@
+import { Controller } from "@hotwired/stimulus"
+
+/**
+ * Dynamically styles a <select> as a colored chip based on its current value.
+ *
+ * Usage:
+ *   <select data-controller="chip-select"
+ *           data-chip-select-styles-value='{"active":"bg-green-100 text-green-700","inactive":"bg-gray-100 text-gray-600"}'
+ *           data-action="chip-select#update">
+ */
+export default class extends Controller {
+  static values = { styles: Object }
+
+  connect() {
+    this.update()
+  }
+
+  update() {
+    if (this._allClasses) {
+      this.element.classList.remove(...this._allClasses)
+    }
+    const classes = this.stylesValue[this.element.value]
+    if (classes) {
+      this.element.classList.add(...classes.split(" "))
+    }
+  }
+
+  stylesValueChanged() {
+    this._allClasses = Object.values(this.stylesValue).join(" ").split(" ")
+    this.update()
+  }
+}
diff --git a/app/frontend/javascript/controllers/form_fields_sortable_controller.js b/app/frontend/javascript/controllers/form_fields_sortable_controller.js
new file mode 100644
index 000000000..e56d93bf0
--- /dev/null
+++ b/app/frontend/javascript/controllers/form_fields_sortable_controller.js
@@ -0,0 +1,73 @@
+import { Controller } from "@hotwired/stimulus"
+import { put } from "@rails/request.js"
+import Sortable from "sortablejs"
+
+/**
+ * Sortable controller for form field editing.
+ *
+ * Section-aware: dragging a group header also moves all fields
+ * that share the same section.
+ *
+ * Usage:
+ *   data-controller="form-fields-sortable"
+ *   data-form-fields-sortable-url-value="/forms/:id/reorder_fields"
+ *
+ * Each item needs:
+ *   data-sortable-id="<field_id>"
+ *   data-sortable-handle  (on the drag handle element)
+ *   data-section="<section_name>"  (optional)
+ *   data-group-header       (on header rows)
+ */
+export default class extends Controller {
+  static values = { url: String }
+
+  connect() {
+    this.sortable = Sortable.create(this.element, {
+      onEnd: this.onEnd.bind(this),
+      handle: "[data-sortable-handle]",
+    })
+  }
+
+  disconnect() {
+    this.sortable.destroy()
+  }
+
+  onEnd(event) {
+    const { item } = event
+
+    // If a group header was moved, relocate its section members to follow it
+    if (item.dataset.groupHeader !== undefined) {
+      const section = item.dataset.section
+      const members = []
+
+      for (const el of this.element.children) {
+        if (el !== item && el.dataset.section === section && el.dataset.groupHeader === undefined) {
+          members.push(el)
+        }
+      }
+
+      let ref = item
+      for (const member of members) {
+        ref.after(member)
+        ref = member
+      }
+    }
+
+    // Update all positions based on current DOM order
+    const items = [...this.element.children]
+    const positions = []
+
+    items.forEach((el, index) => {
+      const pos = index + 1
+      positions.push({ id: parseInt(el.dataset.sortableId), position: pos })
+
+      // Update hidden position field so form submit stays in sync
+      const posInput = el.querySelector("input[name*='[position]']")
+      if (posInput) posInput.value = pos
+    })
+
+    put(this.urlValue, {
+      body: JSON.stringify({ positions }),
+    })
+  }
+}
diff --git a/app/frontend/javascript/controllers/index.js b/app/frontend/javascript/controllers/index.js
index 48d8f2f28..503194f6d 100644
--- a/app/frontend/javascript/controllers/index.js
+++ b/app/frontend/javascript/controllers/index.js
@@ -15,6 +15,9 @@ application.register("autosave", AutosaveController)
 import CarouselController from "./carousel_controller"
 application.register("carousel", CarouselController)
 
+import ChipSelectController from "./chip_select_controller"
+application.register("chip-select", ChipSelectController)
+
 import CocoonController from "./cocoon_controller"
 application.register("cocoon", CocoonController)
 
@@ -42,6 +45,9 @@ application.register("dropdown", DropdownController)
 import FilePreviewController from "./file_preview_controller"
 application.register("file-preview", FilePreviewController)
 
+import FormFieldsSortableController from "./form_fields_sortable_controller"
+application.register("form-fields-sortable", FormFieldsSortableController)
+
 import InactiveToggleController from "./inactive_toggle_controller"
 application.register("inactive-toggle", InactiveToggleController)
 
diff --git a/app/helpers/event_helper.rb b/app/helpers/event_helper.rb
index 1df91f994..e385fecb0 100644
--- a/app/helpers/event_helper.rb
+++ b/app/helpers/event_helper.rb
@@ -78,14 +78,14 @@ def event_profile_button(event, truncate_at: nil, subtitle: nil, data: {})
   end
 
   def display_response_text(field, response)
-    return tag.span("—", class: "text-gray-400") if response&.text.blank?
+    return tag.span("—", class: "text-gray-400") if response&.submitted_answer.blank?
 
-    if field.field_key == "primary_service_area"
-      response.text.split(", ").map { |id| Sector.find_by(id: id)&.name }.compact.join(", ").presence || response.text
-    elsif field.field_key.in?(%w[workshop_environments client_life_experiences primary_age_group])
-      response.text.split(", ").map { |id| Category.find_by(id: id)&.name }.compact.join(", ").presence || response.text
+    if field.field_identifier == "primary_service_area"
+      response.submitted_answer.split(", ").map { |id| Sector.find_by(id: id)&.name }.compact.join(", ").presence || response.submitted_answer
+    elsif field.field_identifier.in?(%w[workshop_environments client_life_experiences primary_age_group])
+      response.submitted_answer.split(", ").map { |id| Category.find_by(id: id)&.name }.compact.join(", ").presence || response.submitted_answer
     else
-      response.text
+      response.submitted_answer
     end
   end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index 8f67557f0..bed4328f4 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -149,7 +149,7 @@ def public_registration_just_enabled?
   def build_public_registration_form
     return if event_forms.registration.exists?
 
-    form_name = title&.match?(/training/i) ? ExtendedEventRegistrationFormBuilder::FORM_NAME : ShortEventRegistrationFormBuilder::FORM_NAME
+    form_name = title&.match?(/training/i) ? "Extended Event Registration" : "Short Event Registration"
     form = Form.standalone.find_by(name: form_name)
     return unless form
 
diff --git a/app/models/form.rb b/app/models/form.rb
index 6c238178b..0e5657f9c 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -3,13 +3,14 @@ class Form < ApplicationRecord
   has_many :form_fields, dependent: :destroy, inverse_of: :form
   has_many :event_forms, dependent: :destroy
   has_many :user_forms
-  has_many :person_forms
+  has_many :form_submissions
   has_many :reports, as: :owner
   # has_many through
   has_many :events, through: :event_forms
 
   # Nested attributes
-  accepts_nested_attributes_for :form_fields, allow_destroy: true
+  accepts_nested_attributes_for :form_fields, allow_destroy: true,
+    reject_if: proc { |attrs| attrs["name"].blank? && attrs["id"].blank? }
 
   scope :scholarship_application, -> { where(scholarship_application: true) }
   scope :standalone, -> { where(owner_id: nil, owner_type: nil) }
diff --git a/app/models/form_answer.rb b/app/models/form_answer.rb
new file mode 100644
index 000000000..18549ab68
--- /dev/null
+++ b/app/models/form_answer.rb
@@ -0,0 +1,8 @@
+class FormAnswer < ApplicationRecord
+  belongs_to :form_field, optional: true
+  belongs_to :form_submission
+
+  def name
+    "#{question_name_when_answered.presence || form_field&.name}: #{submitted_answer}"
+  end
+end
diff --git a/app/models/form_field.rb b/app/models/form_field.rb
index 412b87586..47c4deabd 100644
--- a/app/models/form_field.rb
+++ b/app/models/form_field.rb
@@ -8,13 +8,12 @@ class FormField < ApplicationRecord
   has_many :answer_options, through: :form_field_answer_options
 
   # Validations
-  validates_presence_of :question
+  validates_presence_of :name
 
   # Enum
   enum :status, [ :inactive, :active ]
+  enum :visibility, [ :always_ask, :scholarship_only, :logged_out_only, :answers_on_file ]
 
-  # TODO: Rails 6.1 requires enums to be symbols
-  # need additional refactoring in methods that call answer_type & answer_datatype to account for change to enum
   enum :answer_type, [
     :free_form_input_one_line,
     :free_form_input_paragraph,
@@ -24,7 +23,7 @@ class FormField < ApplicationRecord
     :group_header
   ]
 
-  enum :answer_datatype, [
+  enum :input_type, [
     :text_alphanumeric,
     :number_integer,
     :number_decimal,
@@ -38,57 +37,44 @@ class FormField < ApplicationRecord
   scope :published, -> { where(status: "active") }
 
   # Methods
-  def name
-    question
-  end
-
   def multiple_choice?
-    answer_type ? answer_type.include?("multiple choice") : false
+    answer_type ? answer_type.include?("multiple_choice") : false
   end
 
   def html_id
-    self.question.tr(" /#,')(.", "_").downcase
+    self.name.tr(" /#,')(.", "_").downcase
   end
 
   def html_input_type
-    case answer_type
-
-    when !self.parent_id.nil?
-      :child
-
-    when "free-form input - one line"
-      self.parent_id.nil? ? :text : :child
+    return :child unless parent_id.nil?
 
-    when "free-form input - paragraph"
+    case answer_type
+    when "free_form_input_one_line"
+      :text
+    when "free_form_input_paragraph"
       :textarea
-
-    when "multiple choice - checkbox"
+    when "multiple_choice_checkbox"
       :checkbox
-
-    when "multiple choice - radio"
+    when "multiple_choice_radio"
       :radio
-
-    when "no user input"
-      !self.childs.empty? ? :group_header : :label
-
+    when "no_user_input", "group_header"
+      childs.any? ? :group_header : :label
     else
       :hidden
     end
   end
 
-  # This one bellow should be removed and use
-  # html_input_type
-  def input_type
+  def form_helper_type
     case answer_type
-    when "free-form input - one line"
+    when "free_form_input_one_line"
       :text_field
-    when "free-form input - paragraph"
+    when "free_form_input_paragraph"
       :text_area
-    when "multiple choice - checkbox"
+    when "multiple_choice_checkbox"
       :check_box
-    when "multiple choice - radio"
+    when "multiple_choice_radio"
       :radio_button
-    when "no user input"
+    when "no_user_input", "group_header"
       :label
     else
       :hidden_field
diff --git a/app/models/form_submission.rb b/app/models/form_submission.rb
new file mode 100644
index 000000000..d54a48bef
--- /dev/null
+++ b/app/models/form_submission.rb
@@ -0,0 +1,7 @@
+class FormSubmission < ApplicationRecord
+  belongs_to :person
+  belongs_to :form
+  has_many :form_answers, dependent: :destroy
+
+  accepts_nested_attributes_for :form_answers
+end
diff --git a/app/models/person.rb b/app/models/person.rb
index 556994930..aa99f91d8 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -23,7 +23,7 @@ class Person < ApplicationRecord
   has_many :events, through: :event_registrations
   has_many :categories, through: :categorizable_items
   has_many :sectors, through: :sectorable_items
-  has_many :person_forms, dependent: :destroy
+  has_many :form_submissions, dependent: :destroy
 
   # Asset associations
   has_one_attached :avatar, dependent: :purge do |attachable|
diff --git a/app/models/person_form.rb b/app/models/person_form.rb
deleted file mode 100644
index 2c4a4cfcd..000000000
--- a/app/models/person_form.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class PersonForm < ApplicationRecord
-  belongs_to :person
-  belongs_to :form
-  has_many :person_form_form_fields, dependent: :destroy
-
-  accepts_nested_attributes_for :person_form_form_fields
-end
diff --git a/app/models/person_form_form_field.rb b/app/models/person_form_form_field.rb
deleted file mode 100644
index 2ef92ebf0..000000000
--- a/app/models/person_form_form_field.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class PersonFormFormField < ApplicationRecord
-  belongs_to :form_field
-  belongs_to :person_form
-
-  def name
-    "#{form_field.question}: #{text}"
-  end
-end
diff --git a/app/models/report_form_field_answer.rb b/app/models/report_form_field_answer.rb
index e11487cae..85995c293 100644
--- a/app/models/report_form_field_answer.rb
+++ b/app/models/report_form_field_answer.rb
@@ -6,7 +6,7 @@ class ReportFormFieldAnswer < ApplicationRecord
   belongs_to :answer_option, optional: true
 
   def name
-    "#{form_field.question} - #{response}" unless form_field.nil?
+    "#{form_field.name} - #{response}" unless form_field.nil?
   end
 
   def response
diff --git a/app/models/user_form_form_field.rb b/app/models/user_form_form_field.rb
index ae65c65e5..d7b5c92ee 100644
--- a/app/models/user_form_form_field.rb
+++ b/app/models/user_form_form_field.rb
@@ -3,6 +3,6 @@ class UserFormFormField < ApplicationRecord
   belongs_to :user_form
 
   def name
-    "#{form_field.question}: #{text}"
+    "#{form_field.name}: #{text}"
   end
 end
diff --git a/app/policies/form_policy.rb b/app/policies/form_policy.rb
new file mode 100644
index 000000000..f2514e20c
--- /dev/null
+++ b/app/policies/form_policy.rb
@@ -0,0 +1,3 @@
+class FormPolicy < ApplicationPolicy
+  # Admin-only — all CRUD actions inherit manage? from ApplicationPolicy
+end
diff --git a/app/services/event_registration_services/public_registration.rb b/app/services/event_registration_services/public_registration.rb
index a5f799297..1dc32a991 100644
--- a/app/services/event_registration_services/public_registration.rb
+++ b/app/services/event_registration_services/public_registration.rb
@@ -34,12 +34,12 @@ def call
             existing.update!(status: "registered")
             send_notifications(existing)
           end
-          update_person_form(person)
+          update_form_submission(person)
           return Result.new(success?: true, event_registration: existing, errors: [])
         end
 
         event_registration = create_event_registration(person)
-        create_person_form(person)
+        create_form_submission(person)
 
         send_notifications(event_registration)
 
@@ -59,7 +59,7 @@ def call
     private
 
     def field_value(key)
-      field = @form.form_fields.find_by(field_key: key)
+      field = @form.form_fields.find_by(field_identifier: key)
       return nil unless field
       @form_params[field.id.to_s]
     end
@@ -127,7 +127,7 @@ def create_mailing_address(person)
         state: new_state,
         zip_code: field_value("mailing_zip"),
         locality: "Unknown",
-        address_type: "mailing",
+        address_type: field_value("mailing_address_type")&.downcase || "mailing",
         primary: true
       )
     end
@@ -226,8 +226,8 @@ def assign_tags(person, organization)
       end
     end
 
-    def collect_ids_from_checkboxes(field_key)
-      field = @form.form_fields.find_by(field_key: field_key)
+    def collect_ids_from_checkboxes(identifier)
+      field = @form.form_fields.find_by(field_identifier: identifier)
       return [] unless field
 
       value = @form_params[field.id.to_s]
@@ -241,21 +241,22 @@ def create_event_registration(person)
       )
     end
 
-    def create_person_form(person)
-      person_form = PersonForm.create!(person: person, form: @form)
-      save_form_fields(person_form)
-      person_form
+    def create_form_submission(person)
+      submission = FormSubmission.create!(person: person, form: @form)
+      save_form_answers(submission)
+      submission
     end
 
-    def update_person_form(person)
-      person_form = PersonForm.find_or_create_by!(person: person, form: @form)
-      save_form_fields(person_form)
-      person_form
+    def update_form_submission(person)
+      submission = FormSubmission.find_or_create_by!(person: person, form: @form)
+      save_form_answers(submission)
+      submission
     end
 
-    def save_form_fields(person_form)
-      @form.form_fields.where(status: :active).find_each do |field|
+    def save_form_answers(submission)
+      @form.form_fields.find_each do |field|
         next if field.group_header?
+        next if field.field_identifier == "confirm_email"
 
         raw_value = @form_params[field.id.to_s]
         text = if raw_value.is_a?(Array)
@@ -264,8 +265,8 @@ def save_form_fields(person_form)
           raw_value.to_s
         end
 
-        record = person_form.person_form_form_fields.find_or_initialize_by(form_field: field)
-        record.update!(text: text)
+        record = submission.form_answers.find_or_initialize_by(form_field: field)
+        record.update!(submitted_answer: text, question_name_when_answered: field.name)
       end
     end
 
diff --git a/app/services/extended_event_registration_form_builder.rb b/app/services/extended_event_registration_form_builder.rb
deleted file mode 100644
index 9a7e2678b..000000000
--- a/app/services/extended_event_registration_form_builder.rb
+++ /dev/null
@@ -1,264 +0,0 @@
-class ExtendedEventRegistrationFormBuilder
-  FORM_NAME = "Extended Event Registration"
-
-  def self.build_standalone!(include_contact_fields: true)
-    form = Form.create!(name: FORM_NAME)
-    new(nil, include_contact_fields:).build_fields!(form)
-    form
-  end
-
-  def self.build!(event, include_contact_fields: true)
-    form = Form.create!(name: FORM_NAME)
-    new(event, include_contact_fields:).build_fields!(form)
-    EventForm.create!(event: event, form: form, role: "registration") if event
-    form
-  end
-
-  def self.copy!(from_form:, to_event:)
-    new_form = Form.create!(
-      name: from_form.name,
-      form_builder_id: from_form.form_builder_id
-    )
-
-    from_form.form_fields.unscoped.where(form_id: from_form.id).order(:position).each do |source_field|
-      new_field = new_form.form_fields.create!(
-        question: source_field.question,
-        answer_type: source_field.answer_type,
-        answer_datatype: source_field.answer_datatype,
-        status: source_field.status,
-        position: source_field.position,
-        is_required: source_field.is_required,
-        instructional_hint: source_field.instructional_hint,
-        field_key: source_field.field_key,
-        field_group: source_field.field_group
-      )
-
-      source_field.form_field_answer_options.each do |ffao|
-        new_field.form_field_answer_options.create!(answer_option: ffao.answer_option)
-      end
-    end
-
-    EventForm.create!(event: to_event, form: new_form, role: "registration")
-    new_form
-  end
-
-  def initialize(event = nil, include_contact_fields: true)
-    @event = event
-    @include_contact_fields = include_contact_fields
-  end
-
-  def build_fields!(form)
-    position = 0
-
-    if @include_contact_fields
-      position = build_contact_fields(form, position)
-    end
-
-    position = build_background_fields(form, position)
-    position = build_professional_fields(form, position)
-    position = build_qualitative_fields(form, position)
-    position = build_scholarship_fields(form, position)
-    build_payment_fields(form, position)
-
-    form
-  end
-
-  private
-
-  def build_contact_fields(form, position)
-    position = add_header(form, position, "Contact Information", group: "contact")
-
-    position = add_field(form, position, "First Name", :free_form_input_one_line,
-                         key: "first_name", group: "contact", required: true)
-    position = add_field(form, position, "Last Name", :free_form_input_one_line,
-                         key: "last_name", group: "contact", required: true)
-    position = add_field(form, position, "Preferred Nickname", :free_form_input_one_line,
-                         key: "nickname", group: "contact", required: false)
-    position = add_field(form, position, "Pronouns", :free_form_input_one_line,
-                         key: "pronouns", group: "contact", required: false)
-    position = add_field(form, position, "Primary Email", :free_form_input_one_line,
-                         key: "primary_email", group: "contact", required: true)
-    position = add_field(form, position, "Primary Email Type", :multiple_choice_radio,
-                         key: "primary_email_type", group: "contact", required: true,
-                         options: %w[Personal Work])
-    position = add_field(form, position, "Secondary Email", :free_form_input_one_line,
-                         key: "secondary_email", group: "contact", required: false)
-    position = add_field(form, position, "Secondary Email Type", :multiple_choice_radio,
-                         key: "secondary_email_type", group: "contact", required: false,
-                         options: %w[Personal Work])
-
-    position = add_header(form, position, "Mailing Address", group: "contact")
-    position = add_field(form, position, "Street Address", :free_form_input_one_line,
-                         key: "mailing_street", group: "contact", required: true)
-    position = add_field(form, position, "City", :free_form_input_one_line,
-                         key: "mailing_city", group: "contact", required: true)
-    position = add_field(form, position, "State / Province", :free_form_input_one_line,
-                         key: "mailing_state", group: "contact", required: true)
-    position = add_field(form, position, "Zip / Postal Code", :free_form_input_one_line,
-                         key: "mailing_zip", group: "contact", required: true)
-    position = add_field(form, position, "Mailing Address Type", :multiple_choice_radio,
-                         key: "mailing_address_type", group: "contact", required: true,
-                         options: %w[Work Personal])
-
-    position = add_field(form, position, "Phone", :free_form_input_one_line,
-                         key: "phone", group: "contact", required: true)
-    position = add_field(form, position, "Phone Type", :multiple_choice_radio,
-                         key: "phone_type", group: "contact", required: true,
-                         options: %w[Mobile Home Work])
-
-    position = add_header(form, position, "Agency / Organization Information", group: "contact")
-    position = add_field(form, position, "Agency / Organization Name", :free_form_input_one_line,
-                         key: "agency_name", group: "contact", required: false)
-    position = add_field(form, position, "Position / Title", :free_form_input_one_line,
-                         key: "agency_position", group: "contact", required: false)
-    position = add_field(form, position, "Agency Street Address", :free_form_input_one_line,
-                         key: "agency_street", group: "contact", required: false)
-    position = add_field(form, position, "Agency City", :free_form_input_one_line,
-                         key: "agency_city", group: "contact", required: false)
-    position = add_field(form, position, "Agency State / Province", :free_form_input_one_line,
-                         key: "agency_state", group: "contact", required: false)
-    position = add_field(form, position, "Agency Zip / Postal Code", :free_form_input_one_line,
-                         key: "agency_zip", group: "contact", required: false)
-    position = add_field(form, position, "Agency Type", :multiple_choice_radio,
-                         key: "agency_type", group: "contact", required: false,
-                         options: [
-                           "Domestic Violence", "Homeless Shelter", "Hospital",
-                           "Mental Health", "School", "After-School Program",
-                           "Community Center", "Other"
-                         ])
-    position = add_field(form, position, "Agency Website", :free_form_input_one_line,
-                         key: "agency_website", group: "contact", required: false)
-
-    position
-  end
-
-  def build_background_fields(form, position)
-    position = add_header(form, position, "Background Information", group: "background")
-
-    position = add_field(form, position, "Racial / Ethnic Identity", :free_form_input_one_line,
-                         key: "racial_ethnic_identity", group: "background", required: false,
-                         hint: "This information helps us understand the diversity of our community.")
-
-    position
-  end
-
-  def build_professional_fields(form, position)
-    position = add_header(form, position, "Professional Information", group: "professional")
-
-    position = add_field(form, position, "Primary Service Area(s)", :multiple_choice_checkbox,
-                         key: "primary_service_area", group: "professional", required: false,
-                         hint: "Select all that apply. These represent the sectors you primarily serve.")
-    position = add_field(form, position, "Workshop Settings", :multiple_choice_checkbox,
-                         key: "workshop_settings", group: "professional", required: false,
-                         hint: "Select all settings where you facilitate or plan to facilitate workshops.",
-                         options: [
-                           "Clinical", "Educational", "Events / conferences",
-                           "Faith-based", "Home visits", "Hospitals",
-                           "Law enforcement / court / legal", "Outreach",
-                           "Prisons / jails", "Private practice", "Residential",
-                           "Virtually", "With staff", "Other"
-                         ])
-    position = add_field(form, position, "Client Life Experiences", :multiple_choice_checkbox,
-                         key: "client_life_experiences", group: "professional", required: false,
-                         hint: "Select all that describe the populations you work with.")
-    position = add_field(form, position, "Primary Age Group(s) Served", :multiple_choice_checkbox,
-                         key: "primary_age_group", group: "professional", required: false,
-                         hint: "Select all age groups you primarily serve.")
-
-    position
-  end
-
-  def build_qualitative_fields(form, position)
-    position = add_header(form, position, "About You", group: "qualitative")
-
-    position = add_field(form, position, "How did you hear about this training?", :free_form_input_paragraph,
-                         key: "referral_source", group: "qualitative", required: false)
-    position = add_field(form, position, "What motivates you to attend this training?", :free_form_input_paragraph,
-                         key: "training_motivation", group: "qualitative", required: false)
-    position = add_field(form, position, "Are you interested in learning more about upcoming trainings or resources?", :multiple_choice_radio,
-                         key: "interested_in_more", group: "qualitative", required: true,
-                         options: %w[Yes No])
-
-    position
-  end
-
-  def build_scholarship_fields(form, position)
-    position = add_header(form, position, "Scholarship Application", group: "scholarship")
-
-    position = add_field(form, position,
-                         "I / my agency cannot afford the full training cost and need a scholarship to attend.",
-                         :multiple_choice_checkbox,
-                         key: "scholarship_eligibility", group: "scholarship", required: true,
-                         options: [ "Yes" ])
-    position = add_field(form, position,
-                         "How will what you gain from this training directly impact the people you serve?",
-                         :free_form_input_paragraph,
-                         key: "impact_description", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position,
-                         "Please describe one way in which you plan to use art workshops and how you envision it will help.",
-                         :free_form_input_paragraph,
-                         key: "implementation_plan", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position, "Anything else you'd like to share with us?", :free_form_input_paragraph,
-                         key: "additional_comments", group: "scholarship", required: false)
-
-    position
-  end
-
-  def build_payment_fields(form, position)
-    position = add_header(form, position, "Payment Information", group: "payment")
-
-    position = add_field(form, position, "Number of Attendees", :free_form_input_one_line,
-                         key: "number_of_attendees", group: "payment", required: true,
-                         hint: "How many people are you registering (including yourself)?",
-                         datatype: :number_integer)
-    position = add_field(form, position, "Payment Method", :multiple_choice_radio,
-                         key: "payment_method", group: "payment", required: true,
-                         options: [ "Credit Card", "Check", "Purchase Order", "Other" ])
-
-    position
-  end
-
-  # --- helpers ---
-
-  def add_header(form, position, title, group:)
-    position += 1
-    form.form_fields.create!(
-      question: title,
-      answer_type: :group_header,
-      status: :active,
-      position: position,
-      is_required: false,
-      field_key: nil,
-      field_group: group
-    )
-    position
-  end
-
-  def add_field(form, position, question, answer_type, key:, group:, required: true, hint: nil, options: nil, datatype: nil)
-    position += 1
-    field = form.form_fields.create!(
-      question: question,
-      answer_type: answer_type,
-      answer_datatype: datatype,
-      status: :active,
-      position: position,
-      is_required: required,
-      instructional_hint: hint,
-      field_key: key,
-      field_group: group
-    )
-
-    if options.present?
-      options.each_with_index do |opt, idx|
-        ao = AnswerOption.find_or_create_by!(name: opt) do |a|
-          a.position = idx
-        end
-        field.form_field_answer_options.create!(answer_option: ao)
-      end
-    end
-
-    position
-  end
-end
diff --git a/app/services/form_builder_service.rb b/app/services/form_builder_service.rb
new file mode 100644
index 000000000..8a15ec4f9
--- /dev/null
+++ b/app/services/form_builder_service.rb
@@ -0,0 +1,343 @@
+class FormBuilderService
+  SECTIONS = {
+    person_identifier: { label: "Person identifier", method: :build_person_identifier_fields },
+    person_contact_info: { label: "Person contact info", method: :build_person_contact_info_fields },
+    person_background: { label: "Person background", method: :build_person_background_fields },
+    professional_info: { label: "Professional info", method: :build_professional_info_fields },
+    marketing: { label: "Marketing", method: :build_marketing_fields },
+    scholarship: { label: "Scholarship", method: :build_scholarship_fields },
+    payment: { label: "Payment", method: :build_payment_fields },
+    consent: { label: "Consent", method: :build_consent_fields },
+    post_event_feedback: { label: "Post-event feedback", method: :build_post_event_feedback_fields }
+  }.freeze
+
+  def initialize(name:, sections:, scholarship_application: false)
+    @name = name
+    @sections = sections.map(&:to_sym)
+    @scholarship_application = scholarship_application
+  end
+
+  def call
+    form = Form.create!(
+      name: @name,
+      sections: @sections.map(&:to_s),
+      scholarship_application: @scholarship_application
+    )
+
+    position = 0
+    @sections.each do |key|
+      section = SECTIONS.fetch(key)
+      position = send(section[:method], form, position)
+    end
+
+    form
+  end
+
+  SECTION_FIELD_IDENTIFIERS = {
+    person_identifier: %w[first_name last_name primary_email confirm_email],
+    person_contact_info: %w[
+      primary_email_type nickname pronouns secondary_email secondary_email_type
+      mailing_street mailing_address_type mailing_city mailing_state mailing_zip
+      phone phone_type agency_name agency_position agency_street agency_city
+      agency_state agency_zip agency_type agency_website
+    ],
+    person_background: %w[racial_ethnic_identity],
+    professional_info: %w[primary_service_area workshop_environments client_life_experiences primary_age_group],
+    marketing: %w[referral_source training_motivation interested_in_more],
+    scholarship: %w[scholarship_eligibility impact_description implementation_plan additional_comments],
+    payment: %w[number_of_attendees payment_method],
+    consent: %w[communication_consent],
+    post_event_feedback: %w[event_rating most_valuable improvement_suggestions]
+  }.freeze
+
+  # Header questions created by each section's builder method
+  SECTION_HEADERS = {
+    person_identifier: [],
+    person_contact_info: [ "Contact Information", "Mailing Address", "Agency / Organization Information" ],
+    person_background: [ "Background Information" ],
+    professional_info: [ "Professional Information" ],
+    marketing: [ "Marketing" ],
+    scholarship: [ "Scholarship Application" ],
+    payment: [ "Payment Information" ],
+    consent: [ "Consent" ],
+    post_event_feedback: [ "Post-Event Feedback" ]
+  }.freeze
+
+  # Update sections on an existing form: add new sections, remove unchecked ones
+  def self.update_sections!(form, new_sections)
+    new_sections = new_sections.map(&:to_sym)
+    old_sections = (form.sections || []).map(&:to_sym)
+
+    added = new_sections - old_sections
+    removed = old_sections - new_sections
+
+    # Remove fields and headers belonging to removed sections
+    removed.each do |key|
+      identifiers = SECTION_FIELD_IDENTIFIERS.fetch(key)
+      form.form_fields.where(field_identifier: identifiers).destroy_all
+
+      headers = SECTION_HEADERS.fetch(key)
+      if headers.any?
+        form.form_fields.where(name: headers, answer_type: :group_header).destroy_all
+      end
+    end
+
+    # Add fields for new sections at the end
+    if added.any?
+      max_position = form.form_fields.maximum(:position) || 0
+      builder = new(name: form.name, sections: added)
+      added.each do |key|
+        section = SECTIONS.fetch(key)
+        max_position = builder.send(section[:method], form, max_position)
+      end
+    end
+
+    form.update!(sections: new_sections.map(&:to_s))
+    form
+  end
+
+  private
+
+  SECTION_VISIBILITY = {
+    "person_identifier" => :logged_out_only,
+    "person_contact_info" => :logged_out_only,
+    "background" => :logged_out_only,
+    "professional" => :answers_on_file,
+    "marketing" => :answers_on_file,
+    "payment" => :answers_on_file,
+    "scholarship" => :scholarship_only,
+    "consent" => :answers_on_file,
+    "post_event_feedback" => :answers_on_file
+  }.freeze
+
+  # Sections where answers carry across all events (ask once ever)
+  ONE_TIME_SECTIONS = %w[professional background].freeze
+
+  def add_header(form, position, title, group:)
+    position += 1
+    form.form_fields.create!(
+      name: title,
+      answer_type: :group_header,
+      status: :active,
+      position: position,
+      required: false,
+      field_identifier: nil,
+      section: group,
+      visibility: SECTION_VISIBILITY.fetch(group, :always_ask),
+      one_time: ONE_TIME_SECTIONS.include?(group)
+    )
+    position
+  end
+
+  def add_field(form, position, field_name, answer_type, key:, group:, required: true, hint: nil, options: nil, datatype: nil)
+    position += 1
+    field = form.form_fields.create!(
+      name: field_name,
+      answer_type: answer_type,
+      input_type: datatype,
+      status: :active,
+      position: position,
+      required: required,
+      hint_text: hint,
+      field_identifier: key,
+      section: group,
+      visibility: SECTION_VISIBILITY.fetch(group, :always_ask),
+      one_time: ONE_TIME_SECTIONS.include?(group)
+    )
+
+    if options.present?
+      options.each_with_index do |opt, idx|
+        ao = AnswerOption.find_or_create_by!(name: opt) do |a|
+          a.position = idx
+        end
+        field.form_field_answer_options.create!(answer_option: ao)
+      end
+    end
+
+    position
+  end
+
+  # ---- Section builders ----
+
+  def build_person_identifier_fields(form, position)
+    position = add_field(form, position, "First Name", :free_form_input_one_line,
+                         key: "first_name", group: "person_identifier", required: true)
+    position = add_field(form, position, "Last Name", :free_form_input_one_line,
+                         key: "last_name", group: "person_identifier", required: true)
+    position = add_field(form, position, "Email", :free_form_input_one_line,
+                         key: "primary_email", group: "person_identifier", required: true)
+    position = add_field(form, position, "Confirm Email", :free_form_input_one_line,
+                         key: "confirm_email", group: "person_identifier", required: true)
+    position
+  end
+
+  def build_person_contact_info_fields(form, position)
+    position = add_header(form, position, "Contact Information", group: "person_contact_info")
+
+    position = add_field(form, position, "Primary Email Type", :multiple_choice_radio,
+                         key: "primary_email_type", group: "person_contact_info", required: true,
+                         options: %w[Personal Work])
+    position = add_field(form, position, "Preferred Nickname", :free_form_input_one_line,
+                         key: "nickname", group: "person_contact_info", required: false)
+    position = add_field(form, position, "Pronouns", :free_form_input_one_line,
+                         key: "pronouns", group: "person_contact_info", required: false)
+    position = add_field(form, position, "Secondary Email", :free_form_input_one_line,
+                         key: "secondary_email", group: "person_contact_info", required: false)
+    position = add_field(form, position, "Secondary Email Type", :multiple_choice_radio,
+                         key: "secondary_email_type", group: "person_contact_info", required: false,
+                         options: %w[Personal Work])
+
+    position = add_header(form, position, "Mailing Address", group: "person_contact_info")
+    position = add_field(form, position, "Street Address", :free_form_input_one_line,
+                         key: "mailing_street", group: "person_contact_info", required: true)
+    position = add_field(form, position, "Address Type", :multiple_choice_radio,
+                         key: "mailing_address_type", group: "person_contact_info", required: true,
+                         options: %w[Home Work])
+    position = add_field(form, position, "City", :free_form_input_one_line,
+                         key: "mailing_city", group: "person_contact_info", required: true)
+    position = add_field(form, position, "State / Province", :free_form_input_one_line,
+                         key: "mailing_state", group: "person_contact_info", required: true)
+    position = add_field(form, position, "Zip / Postal Code", :free_form_input_one_line,
+                         key: "mailing_zip", group: "person_contact_info", required: true)
+
+    position = add_field(form, position, "Phone", :free_form_input_one_line,
+                         key: "phone", group: "person_contact_info", required: true)
+    position = add_field(form, position, "Phone Type", :multiple_choice_radio,
+                         key: "phone_type", group: "person_contact_info", required: true,
+                         options: %w[Mobile Home Work])
+
+    position = add_header(form, position, "Agency / Organization Information", group: "person_contact_info")
+    position = add_field(form, position, "Agency / Organization Name", :free_form_input_one_line,
+                         key: "agency_name", group: "person_contact_info", required: false)
+    position = add_field(form, position, "Position / Title", :free_form_input_one_line,
+                         key: "agency_position", group: "person_contact_info", required: false)
+    position = add_field(form, position, "Agency Street Address", :free_form_input_one_line,
+                         key: "agency_street", group: "person_contact_info", required: false)
+    position = add_field(form, position, "Agency City", :free_form_input_one_line,
+                         key: "agency_city", group: "person_contact_info", required: false)
+    position = add_field(form, position, "Agency State / Province", :free_form_input_one_line,
+                         key: "agency_state", group: "person_contact_info", required: false)
+    position = add_field(form, position, "Agency Zip / Postal Code", :free_form_input_one_line,
+                         key: "agency_zip", group: "person_contact_info", required: false)
+    position = add_field(form, position, "Agency Type", :multiple_choice_radio,
+                         key: "agency_type", group: "person_contact_info", required: false,
+                         options: [
+                           "Domestic Violence", "Homeless Shelter", "Hospital",
+                           "Mental Health", "School", "After-School Program",
+                           "Community Center", "Other"
+                         ])
+    position = add_field(form, position, "Agency Website", :free_form_input_one_line,
+                         key: "agency_website", group: "person_contact_info", required: false)
+    position
+  end
+
+  def build_person_background_fields(form, position)
+    position = add_header(form, position, "Background Information", group: "background")
+
+    position = add_field(form, position, "Racial / Ethnic Identity", :free_form_input_one_line,
+                         key: "racial_ethnic_identity", group: "background", required: false,
+                         hint: "This information helps us understand the diversity of our community.")
+    position
+  end
+
+  def build_professional_info_fields(form, position)
+    position = add_header(form, position, "Professional Information", group: "professional")
+
+    position = add_field(form, position, "Primary Service Area(s)", :multiple_choice_checkbox,
+                         key: "primary_service_area", group: "professional", required: false,
+                         hint: "Select all that apply. These represent the sectors you primarily serve.")
+    position = add_field(form, position, "Workshop Settings", :multiple_choice_checkbox,
+                         key: "workshop_environments", group: "professional", required: false,
+                         hint: "Select all settings where you facilitate or plan to facilitate workshops.",
+                         options: [
+                           "Clinical", "Educational", "Events / conferences",
+                           "Faith-based", "Home visits", "Hospitals",
+                           "Law enforcement / court / legal", "Outreach",
+                           "Prisons / jails", "Private practice", "Residential",
+                           "Virtually", "With staff", "Other"
+                         ])
+    position = add_field(form, position, "Client Life Experiences", :multiple_choice_checkbox,
+                         key: "client_life_experiences", group: "professional", required: false,
+                         hint: "Select all that describe the populations you work with.")
+    position = add_field(form, position, "Primary Age Group(s) Served", :multiple_choice_checkbox,
+                         key: "primary_age_group", group: "professional", required: false,
+                         hint: "Select all age groups you primarily serve.")
+    position
+  end
+
+  def build_marketing_fields(form, position)
+    position = add_header(form, position, "Marketing", group: "marketing")
+
+    position = add_field(form, position, "How did you hear about this training?", :free_form_input_paragraph,
+                         key: "referral_source", group: "marketing", required: false)
+    position = add_field(form, position, "What motivates you to attend this training?", :free_form_input_paragraph,
+                         key: "training_motivation", group: "marketing", required: false)
+    position = add_field(form, position, "Are you interested in learning more about upcoming trainings or resources?",
+                         :multiple_choice_radio,
+                         key: "interested_in_more", group: "marketing", required: true,
+                         options: %w[Yes No])
+    position
+  end
+
+  def build_scholarship_fields(form, position)
+    position = add_header(form, position, "Scholarship Application", group: "scholarship")
+
+    position = add_field(form, position,
+                         "I / my agency cannot afford the full training cost and need a scholarship to attend.",
+                         :multiple_choice_checkbox,
+                         key: "scholarship_eligibility", group: "scholarship", required: true,
+                         options: [ "Yes" ])
+    position = add_field(form, position,
+                         "How will what you gain from this training directly impact the people you serve?",
+                         :free_form_input_paragraph,
+                         key: "impact_description", group: "scholarship", required: true,
+                         hint: "Please describe in 3-5+ sentences.")
+    position = add_field(form, position,
+                         "Please describe one way in which you plan to use art workshops and how you envision it will help.",
+                         :free_form_input_paragraph,
+                         key: "implementation_plan", group: "scholarship", required: true,
+                         hint: "Please describe in 3-5+ sentences.")
+    position = add_field(form, position, "Anything else you'd like to share with us?", :free_form_input_paragraph,
+                         key: "additional_comments", group: "scholarship", required: false)
+    position
+  end
+
+  def build_payment_fields(form, position)
+    position = add_header(form, position, "Payment Information", group: "payment")
+
+    position = add_field(form, position, "Number of Attendees", :free_form_input_one_line,
+                         key: "number_of_attendees", group: "payment", required: true,
+                         hint: "How many people are you registering (including yourself)?",
+                         datatype: :number_integer)
+    position = add_field(form, position, "Payment Method", :multiple_choice_radio,
+                         key: "payment_method", group: "payment", required: true,
+                         options: [ "Credit Card", "Check", "Purchase Order", "Other" ])
+    position
+  end
+
+  def build_consent_fields(form, position)
+    position = add_header(form, position, "Consent", group: "consent")
+    position = add_field(form, position,
+                         "I agree to receive email communications from A Window Between Worlds.",
+                         :multiple_choice_checkbox,
+                         key: "communication_consent", group: "consent", required: true,
+                         hint: "By submitting this form, I consent to receive updates from A Window Between Worlds, " \
+                               "including information about this event as well as upcoming events, training opportunities, resources, " \
+                               "impact stories, and ways to support our mission. I understand I can unsubscribe at any time.",
+                         options: [ "Yes" ])
+    position
+  end
+
+  def build_post_event_feedback_fields(form, position)
+    position = add_header(form, position, "Post-Event Feedback", group: "post_event_feedback")
+
+    position = add_field(form, position, "How would you rate this event?", :multiple_choice_radio,
+                         key: "event_rating", group: "post_event_feedback", required: true,
+                         options: [ "Excellent", "Good", "Fair", "Poor" ])
+    position = add_field(form, position, "What did you find most valuable?", :free_form_input_paragraph,
+                         key: "most_valuable", group: "post_event_feedback", required: false)
+    position = add_field(form, position, "Any suggestions for improvement?", :free_form_input_paragraph,
+                         key: "improvement_suggestions", group: "post_event_feedback", required: false)
+    position
+  end
+end
diff --git a/app/services/scholarship_application_form_builder.rb b/app/services/scholarship_application_form_builder.rb
deleted file mode 100644
index 10331fc2a..000000000
--- a/app/services/scholarship_application_form_builder.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-class ScholarshipApplicationFormBuilder
-  FORM_NAME = "Scholarship Application"
-
-  def self.build_standalone!
-    form = Form.create!(name: FORM_NAME, scholarship_application: true)
-    new.build_fields!(form)
-    form
-  end
-
-  def self.build!(event)
-    form = Form.create!(name: FORM_NAME, scholarship_application: true)
-    new.build_fields!(form)
-    EventForm.create!(event: event, form: form, role: "scholarship") if event
-    form
-  end
-
-  def build_fields!(form)
-    position = 0
-
-    position = add_header(form, position, "Scholarship Application", group: "scholarship")
-
-    position = add_field(form, position,
-                         "I / my agency cannot afford the full training cost and need a scholarship to attend.",
-                         :multiple_choice_checkbox,
-                         key: "scholarship_eligibility", group: "scholarship", required: true,
-                         options: [ "Yes" ])
-    position = add_field(form, position,
-                         "How will what you gain from this training directly impact the people you serve?",
-                         :free_form_input_paragraph,
-                         key: "impact_description", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position,
-                         "Please describe one way in which you plan to use art workshops and how you envision it will help.",
-                         :free_form_input_paragraph,
-                         key: "implementation_plan", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    add_field(form, position, "Anything else you'd like to share with us?", :free_form_input_paragraph,
-              key: "additional_comments", group: "scholarship", required: false)
-
-    form
-  end
-
-  private
-
-  def add_header(form, position, title, group:)
-    position += 1
-    form.form_fields.create!(
-      question: title,
-      answer_type: :group_header,
-      status: :active,
-      position: position,
-      is_required: false,
-      field_key: nil,
-      field_group: group
-    )
-    position
-  end
-
-  def add_field(form, position, question, answer_type, key:, group:, required: true, hint: nil, options: nil)
-    position += 1
-    field = form.form_fields.create!(
-      question: question,
-      answer_type: answer_type,
-      status: :active,
-      position: position,
-      is_required: required,
-      instructional_hint: hint,
-      field_key: key,
-      field_group: group
-    )
-
-    if options.present?
-      options.each_with_index do |opt, idx|
-        ao = AnswerOption.find_or_create_by!(name: opt) { |a| a.position = idx }
-        field.form_field_answer_options.create!(answer_option: ao)
-      end
-    end
-
-    position
-  end
-end
diff --git a/app/services/short_event_registration_form_builder.rb b/app/services/short_event_registration_form_builder.rb
deleted file mode 100644
index 7d5ec291f..000000000
--- a/app/services/short_event_registration_form_builder.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-class ShortEventRegistrationFormBuilder
-  FORM_NAME = "Short Event Registration"
-
-  def self.build_standalone!
-    form = Form.create!(name: FORM_NAME)
-    new.build_fields!(form)
-    form
-  end
-
-  def self.build!(event)
-    form = Form.create!(name: FORM_NAME)
-    new.build_fields!(form)
-    EventForm.create!(event: event, form: form, role: "registration") if event
-    form
-  end
-
-  def build_fields!(form)
-    position = 0
-
-    position = add_field(form, position, "First Name", :free_form_input_one_line,
-                         key: "first_name", group: "contact", required: true)
-    position = add_field(form, position, "Last Name", :free_form_input_one_line,
-                         key: "last_name", group: "contact", required: true)
-    position = add_field(form, position, "Enter Email", :free_form_input_one_line,
-                         key: "primary_email", group: "contact", required: true)
-    position = add_field(form, position, "Confirm Email", :free_form_input_one_line,
-                         key: "confirm_email", group: "contact", required: true)
-
-    position = add_field(form, position, "Consent", :multiple_choice_checkbox,
-                         key: "consent", group: "consent", required: true,
-                         hint: "By submitting this form, I consent to receive updates from A Window Between Worlds, " \
-                               "including information about this event as well as upcoming events, training opportunities, resources, " \
-                               "impact stories, and ways to support our mission. I understand I can unsubscribe at any time.",
-                         options: [ "I agree to receive email communications from A Window Between Worlds." ])
-
-    position = add_field(form, position, "How did you hear about this event?", :multiple_choice_checkbox,
-                         key: "referral_source", group: "qualitative", required: true,
-                         options: [ "AWBW Email", "Facebook", "Instagram", "LinkedIn", "Online Search", "Word of Mouth", "Other" ])
-
-    position = add_field(form, position, "Are you interested in learning more about upcoming trainings or resources?",
-                         :multiple_choice_checkbox,
-                         key: "training_interest", group: "qualitative", required: true,
-                         options: [ "Yes", "Not right now" ])
-
-    position = build_scholarship_fields(form, position)
-
-    position
-  end
-
-  private
-
-  def build_scholarship_fields(form, position)
-    position = add_header(form, position, "Scholarship Application", group: "scholarship")
-
-    position = add_field(form, position,
-                         "I / my agency cannot afford the full training cost and need a scholarship to attend.",
-                         :multiple_choice_checkbox,
-                         key: "scholarship_eligibility", group: "scholarship", required: true,
-                         options: [ "Yes" ])
-    position = add_field(form, position,
-                         "How will what you gain from this training directly impact the people you serve?",
-                         :free_form_input_paragraph,
-                         key: "impact_description", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position,
-                         "Please describe one way in which you plan to use art workshops and how you envision it will help.",
-                         :free_form_input_paragraph,
-                         key: "implementation_plan", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position, "Anything else you'd like to share with us?", :free_form_input_paragraph,
-                         key: "additional_comments", group: "scholarship", required: false)
-
-    position
-  end
-
-  def add_header(form, position, title, group:)
-    position += 1
-    form.form_fields.create!(
-      question: title,
-      answer_type: :group_header,
-      status: :active,
-      position: position,
-      is_required: false,
-      field_key: nil,
-      field_group: group
-    )
-    position
-  end
-
-  def add_field(form, position, question, answer_type, key:, group:, required: true, hint: nil, options: nil)
-    position += 1
-    field = form.form_fields.create!(
-      question: question,
-      answer_type: answer_type,
-      status: :active,
-      position: position,
-      is_required: required,
-      instructional_hint: hint,
-      field_key: key,
-      field_group: group
-    )
-
-    if options.present?
-      options.each_with_index do |opt, idx|
-        ao = AnswerOption.find_or_create_by!(name: opt) { |a| a.position = idx }
-        field.form_field_answer_options.create!(answer_option: ao)
-      end
-    end
-
-    position
-  end
-end
diff --git a/app/views/event_registrations/_ticket.html.erb b/app/views/event_registrations/_ticket.html.erb
index bb81e7db8..fab37ce76 100644
--- a/app/views/event_registrations/_ticket.html.erb
+++ b/app/views/event_registrations/_ticket.html.erb
@@ -141,7 +141,7 @@
         <% if event_registration.active? %>
           <div class="flex flex-col items-center gap-1">
             <% registration_form = event_registration.event.registration_form %>
-            <% if registration_form && registration_form.person_forms.exists?(person: event_registration.registrant) %>
+            <% if registration_form && registration_form.form_submissions.exists?(person: event_registration.registrant) %>
               <%= link_to "View registration details",
                           event_public_registration_path(event_registration.event, reg: event_registration.slug),
                           class: "text-xs text-gray-400 hover:text-blue-600 underline" %>
diff --git a/app/views/event_registrations/index.html.erb b/app/views/event_registrations/index.html.erb
index a807f6c01..55f653241 100644
--- a/app/views/event_registrations/index.html.erb
+++ b/app/views/event_registrations/index.html.erb
@@ -45,7 +45,7 @@
                 </thead>
 
                 <% all_event_form_ids = @event_registrations.flat_map { |er| er.event.event_forms.map(&:form_id) }.uniq %>
-                <% submitted_pairs = all_event_form_ids.any? ? PersonForm.where(form_id: all_event_form_ids, person_id: @event_registrations.map(&:registrant_id).uniq).pluck(:person_id, :form_id).to_set : Set.new %>
+                <% submitted_pairs = all_event_form_ids.any? ? FormSubmission.where(form_id: all_event_form_ids, person_id: @event_registrations.map(&:registrant_id).uniq).pluck(:person_id, :form_id).to_set : Set.new %>
                 <tbody class="divide-y divide-gray-200">
                   <% @event_registrations.each do |event_registration| %>
                     <tr id="<%= dom_id(event_registration) %>" class="hover:bg-gray-50 transition-colors duration-150">
diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
index fe725c838..e503de836 100644
--- a/app/views/events/_form.html.erb
+++ b/app/views/events/_form.html.erb
@@ -386,24 +386,27 @@
               <% default_form_id = if current_reg_form
                                      current_reg_form.id
                                    elsif @event.title&.match?(/training/i)
-                                     @registration_forms.find { |rf| rf.name == ExtendedEventRegistrationFormBuilder::FORM_NAME }&.id
+                                     @registration_forms.find { |rf| rf.name == "Extended Event Registration" }&.id
                                    else
-                                     @registration_forms.find { |rf| rf.name == ShortEventRegistrationFormBuilder::FORM_NAME }&.id
+                                     @registration_forms.find { |rf| rf.name == "Short Event Registration" }&.id
                                    end %>
               <select name="event[registration_form_id]" class="w-full rounded border-gray-300 shadow-sm px-3 py-2 text-sm">
                 <option value="">No registration form</option>
                 <% @registration_forms.each do |reg_form| %>
                   <% label = case reg_form.name
-                             when ExtendedEventRegistrationFormBuilder::FORM_NAME, "Public Registration" then "Extended registration form"
-                             when ShortEventRegistrationFormBuilder::FORM_NAME, "Short Registration" then "Short registration form"
+                             when "Extended Event Registration", "Public Registration" then "Extended registration form"
+                             when "Short Event Registration", "Short Registration" then "Short registration form"
                              else reg_form.name
                              end %>
                   <option value="<%= reg_form.id %>" <%= "selected" if reg_form.id == default_form_id %>><%= label %> (<%= reg_form.form_fields.size %> fields)</option>
                 <% end %>
               </select>
-              <% if @event.cost_cents.to_i > 0 %>
-                <p class="text-xs text-gray-500 mt-1">Scholarship application form will be linked automatically for paid events.</p>
-              <% end %>
+              <p class="text-xs text-gray-500 mt-1">
+                <%= link_to "Create new form", new_form_path, class: "text-blue-600 hover:text-blue-800 underline", target: "_blank" %>
+                <% if @event.cost_cents.to_i > 0 %>
+                  &middot; Scholarship application form will be linked automatically for paid events.
+                <% end %>
+              </p>
             </div>
           </div>
         </div>
diff --git a/app/views/events/_manage_results.html.erb b/app/views/events/_manage_results.html.erb
index 3b4c0707f..5d4c42e88 100644
--- a/app/views/events/_manage_results.html.erb
+++ b/app/views/events/_manage_results.html.erb
@@ -14,7 +14,7 @@
       </label>
     </div>
     <% event_form_ids = @event.form_ids %>
-    <% form_submissions = event_form_ids.any? ? PersonForm.joins(:form).where(form_id: event_form_ids, person_id: @event_registrations.map(&:registrant_id)).pluck(:person_id, :created_at, Arel.sql("forms.name")).group_by(&:first).transform_values { |rows| rows.map { |_, ts, name| [ name, ts ] } } : {} %>
+    <% form_submissions = event_form_ids.any? ? FormSubmission.joins(:form).where(form_id: event_form_ids, person_id: @event_registrations.map(&:registrant_id)).pluck(:person_id, :created_at, Arel.sql("forms.name")).group_by(&:first).transform_values { |rows| rows.map { |_, ts, name| [ name, ts ] } } : {} %>
     <% if @event_registrations.any? %>
       <div class="overflow-x-auto">
         <table class="w-full border-collapse border border-gray-200">
diff --git a/app/views/events/public_registrations/_form_field.html.erb b/app/views/events/public_registrations/_form_field.html.erb
index d5fe9730f..50c912184 100644
--- a/app/views/events/public_registrations/_form_field.html.erb
+++ b/app/views/events/public_registrations/_form_field.html.erb
@@ -1,4 +1,4 @@
-<%# locals: (field:, value: nil) %>
+<%# locals: (field:, value: nil, label: nil) %>
 <% return if field.group_header? %>
 
 <% error = @field_errors&.dig(field.id) %>
@@ -6,14 +6,14 @@
 
 <div class="mb-5">
   <label class="block text-sm font-medium text-gray-700 mb-1" for="public_registration_form_fields_<%= field.id %>">
-    <%= field.question %>
-    <% if field.is_required %>
+    <%= label || field.name %>
+    <% if field.required %>
       <span class="text-red-500">*</span>
     <% end %>
   </label>
 
-  <% if field.instructional_hint.present? %>
-    <p class="text-xs text-gray-500 mb-1"><%= field.instructional_hint %></p>
+  <% if field.hint_text.present? %>
+    <p class="text-xs text-gray-500 mb-1"><%= field.hint_text %></p>
   <% end %>
 
   <% field_name = "public_registration[form_fields][#{field.id}]" %>
@@ -21,11 +21,11 @@
 
   <% case field.answer_type %>
   <% when "free_form_input_one_line" %>
-    <% if field.field_key&.end_with?("_state") %>
+    <% if field.field_identifier&.end_with?("_state") %>
       <select name="<%= field_name %>"
               id="<%= field_id %>"
               class="w-full rounded-md border <%= error_border %> px-3 py-2 text-sm focus:border-blue-500 focus:ring-1 focus:ring-blue-500"
-              <%= "required" if field.is_required %>>
+              <%= "required" if field.required %>>
         <option value="">Select a state</option>
         <% us_states.each do |name, abbr| %>
           <option value="<%= abbr %>" <%= "selected" if value == abbr %>><%= name %> (<%= abbr %>)</option>
@@ -33,7 +33,7 @@
       </select>
     <% else %>
       <%
-        input_type = case field.field_key
+        html_type = case field.field_identifier
                      when /email(?!_type)/ then "email"
                      when "phone" then "tel"
                      when "agency_website" then "url"
@@ -43,12 +43,12 @@
         extra_attrs = []
         extra_attrs << 'min="1" step="1" pattern="[0-9]*" inputmode="numeric"' if field.number_integer?
       %>
-      <input type="<%= input_type %>"
+      <input type="<%= html_type %>"
              name="<%= field_name %>"
              id="<%= field_id %>"
              value="<%= value %>"
              class="w-full rounded-md border <%= error_border %> px-3 py-2 text-sm focus:border-blue-500 focus:ring-1 focus:ring-blue-500"
-             <%= "required" if field.is_required %>
+             <%= "required" if field.required %>
              <%= raw(extra_attrs.join(" ")) %>>
     <% end %>
 
@@ -57,7 +57,7 @@
               id="<%= field_id %>"
               rows="4"
               class="w-full rounded-md border <%= error_border %> px-3 py-2 text-sm focus:border-blue-500 focus:ring-1 focus:ring-blue-500"
-              <%= "required" if field.is_required %>><%= value %></textarea>
+              <%= "required" if field.required %>><%= value %></textarea>
 
   <% when "multiple_choice_radio" %>
     <div class="flex flex-wrap gap-4 mt-1">
@@ -67,8 +67,8 @@
                  name="<%= field_name %>"
                  value="<%= ffao.answer_option.name %>"
                  class="text-blue-600 focus:ring-blue-500"
-                 <%= "checked" if value == ffao.answer_option.name || (value.blank? && field.field_key == "interested_in_more" && ffao.answer_option.name == "Yes") %>
-                 <%= "required" if field.is_required %>>
+                 <%= "checked" if value == ffao.answer_option.name || (value.blank? && field.field_identifier == "interested_in_more" && ffao.answer_option.name == "Yes") %>
+                 <%= "required" if field.required %>>
           <%= ffao.answer_option.name %>
         </label>
       <% end %>
@@ -78,9 +78,9 @@
     <% checkbox_name = "public_registration[form_fields][#{field.id}][]" %>
     <% selected_values = Array(value) %>
 
-    <% if field.field_key.in?(%w[primary_service_area workshop_environments client_life_experiences primary_age_group]) %>
+    <% if field.field_identifier.in?(%w[primary_service_area workshop_environments client_life_experiences primary_age_group]) %>
       <%# Professional fields: render dynamic sector/category options %>
-      <% if field.field_key == "primary_service_area" %>
+      <% if field.field_identifier == "primary_service_area" %>
         <% options = Sector.published.order(:name) %>
         <div class="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-1">
           <% options.each do |sector| %>
@@ -100,7 +100,7 @@
           "workshop_environments" => "WorkshopEnvironment",
           "client_life_experiences" => "StoryPopulation",
           "primary_age_group" => "AgeRange"
-        }[field.field_key] %>
+        }[field.field_identifier] %>
         <% ct = CategoryType.find_by(name: category_type_name) %>
         <% options = ct&.categories&.published&.order(:position, :name) || [] %>
         <div class="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-1">
@@ -135,6 +135,6 @@
   <% end %>
 
   <% if error %>
-    <p class="text-xs text-red-600 mt-1"><%= field.question %> <%= error %></p>
+    <p class="text-xs text-red-600 mt-1"><%= field.name %> <%= error %></p>
   <% end %>
 </div>
diff --git a/app/views/events/public_registrations/new.html.erb b/app/views/events/public_registrations/new.html.erb
index bd5974a33..244a90d50 100644
--- a/app/views/events/public_registrations/new.html.erb
+++ b/app/views/events/public_registrations/new.html.erb
@@ -62,8 +62,10 @@
 
         <%# Row groupings: related fields share a grid row on md+ screens %>
         <%
-          fields_by_key_check = @form_fields.select(&:field_key).index_by(&:field_key)
-          email_row = if fields_by_key_check["confirm_email"]
+          fields_by_id_check = @form_fields.select(&:field_identifier).index_by(&:field_identifier)
+          email_row = if fields_by_id_check["confirm_email"] && fields_by_id_check["primary_email_type"]
+            { keys: %w[primary_email confirm_email primary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4" }
+          elsif fields_by_id_check["confirm_email"]
             { keys: %w[primary_email confirm_email], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" }
           else
             { keys: %w[primary_email primary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "primary_email" => "md:col-span-2" } }
@@ -74,6 +76,7 @@
             { keys: %w[nickname pronouns], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
             email_row,
             { keys: %w[secondary_email secondary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "secondary_email" => "md:col-span-2" } },
+            { keys: %w[mailing_street mailing_address_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
             { keys: %w[mailing_city mailing_state mailing_zip], grid: "grid grid-cols-1 md:grid-cols-3 gap-4" },
             { keys: %w[phone phone_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
             { keys: %w[agency_name agency_position], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
@@ -81,34 +84,42 @@
             { keys: %w[number_of_attendees payment_method], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
           ]
 
-          field_key_to_group = {}
-          row_groups.each { |g| g[:keys].each { |k| field_key_to_group[k] = g } }
+          identifier_to_group = {}
+          row_groups.each { |g| g[:keys].each { |k| identifier_to_group[k] = g } }
 
-          fields_by_key = @form_fields.select(&:field_key).index_by(&:field_key)
-          rendered_keys = {}
+          fields_by_identifier = @form_fields.select(&:field_identifier).index_by(&:field_identifier)
+          rendered_ids = {}
+
+          has_secondary_email = fields_by_identifier["secondary_email"].present?
+          email_label_overrides = if has_secondary_email
+            { "primary_email" => "Primary Email", "confirm_email" => "Confirm Primary Email", "primary_email_type" => "Primary Email Type" }
+          else
+            {}
+          end
         %>
 
         <% @form_fields.each do |field| %>
-          <% next if field.field_key.present? && rendered_keys[field.field_key] %>
+          <% next if field.field_identifier.present? && rendered_ids[field.field_identifier] %>
 
           <% if field.group_header? %>
             <div class="pt-6 pb-2 border-b border-gray-200 mb-4">
-              <h3 class="text-lg font-semibold text-gray-800"><%= field.question %></h3>
+              <h3 class="text-lg font-semibold text-gray-800"><%= field.name %></h3>
             </div>
-          <% elsif (group = field.field_key.present? && field_key_to_group[field.field_key]) %>
+          <% elsif (group = field.field_identifier.present? && identifier_to_group[field.field_identifier]) %>
             <div class="<%= group[:grid] %>">
               <% group[:keys].each do |key| %>
-                <% row_field = fields_by_key[key] %>
+                <% row_field = fields_by_identifier[key] %>
                 <% next unless row_field %>
-                <% rendered_keys[key] = true %>
+                <% rendered_ids[key] = true %>
                 <% span = group.dig(:spans, key) %>
                 <% submitted_value = params.dig(:public_registration, :form_fields, row_field.id.to_s) %>
+                <% label_override = email_label_overrides[key] %>
                 <% if span %>
                   <div class="<%= span %>">
-                    <%= render "events/public_registrations/form_field", field: row_field, value: submitted_value %>
+                    <%= render "events/public_registrations/form_field", field: row_field, value: submitted_value, label: label_override %>
                   </div>
                 <% else %>
-                  <%= render "events/public_registrations/form_field", field: row_field, value: submitted_value %>
+                  <%= render "events/public_registrations/form_field", field: row_field, value: submitted_value, label: label_override %>
                 <% end %>
               <% end %>
             </div>
diff --git a/app/views/events/public_registrations/show.html.erb b/app/views/events/public_registrations/show.html.erb
index 94373ae41..ad2c03d50 100644
--- a/app/views/events/public_registrations/show.html.erb
+++ b/app/views/events/public_registrations/show.html.erb
@@ -1,6 +1,6 @@
 <% content_for(:page_bg_class, "public") %>
 
-<% reg = @person_form.person.event_registrations.find_by(event: @event) %>
+<% reg = @form_submission.person.event_registrations.find_by(event: @event) %>
 <% back_path = reg&.slug.present? ? registration_ticket_path(reg.slug) : event_path(@event) %>
 <div class="flex flex-wrap items-center gap-2 mb-4">
   <%= link_to "← Back to Registration", back_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
@@ -32,6 +32,7 @@
           { keys: %w[nickname pronouns], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
           { keys: %w[primary_email primary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "primary_email" => "md:col-span-2" } },
           { keys: %w[secondary_email secondary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "secondary_email" => "md:col-span-2" } },
+          { keys: %w[mailing_street mailing_address_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
           { keys: %w[mailing_city mailing_state mailing_zip], grid: "grid grid-cols-1 md:grid-cols-3 gap-4" },
           { keys: %w[phone phone_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
           { keys: %w[agency_name agency_position], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
@@ -39,30 +40,31 @@
           { keys: %w[number_of_attendees payment_method], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
         ]
 
-        field_key_to_group = {}
-        row_groups.each { |g| g[:keys].each { |k| field_key_to_group[k] = g } }
+        identifier_to_group = {}
+        row_groups.each { |g| g[:keys].each { |k| identifier_to_group[k] = g } }
 
-        fields_by_key = @form_fields.select(&:field_key).index_by(&:field_key)
-        rendered_keys = {}
+        fields_by_identifier = @form_fields.select(&:field_identifier).index_by(&:field_identifier)
+        rendered_ids = {}
       %>
 
       <% @form_fields.each do |field| %>
-        <% next if field.field_key.present? && rendered_keys[field.field_key] %>
+        <% next if field.field_identifier == "confirm_email" %>
+        <% next if field.field_identifier.present? && rendered_ids[field.field_identifier] %>
 
         <% if field.group_header? %>
           <div class="pt-6 pb-2 border-b border-gray-200 mb-4">
-            <h3 class="text-lg font-semibold text-gray-800"><%= field.question %></h3>
+            <h3 class="text-lg font-semibold text-gray-800"><%= field.name %></h3>
           </div>
-        <% elsif (group = field.field_key.present? && field_key_to_group[field.field_key]) %>
+        <% elsif (group = field.field_identifier.present? && identifier_to_group[field.field_identifier]) %>
           <div class="<%= group[:grid] %>">
             <% group[:keys].each do |key| %>
-              <% row_field = fields_by_key[key] %>
+              <% row_field = fields_by_identifier[key] %>
               <% next unless row_field %>
-              <% rendered_keys[key] = true %>
+              <% rendered_ids[key] = true %>
               <% response = @responses[row_field.id] %>
               <% span = group.dig(:spans, key) %>
               <div class="<%= span %> py-2">
-                <dt class="text-xs font-medium text-gray-500 uppercase tracking-wide"><%= row_field.question %></dt>
+                <dt class="text-xs font-medium text-gray-500 uppercase tracking-wide"><%= row_field.name %></dt>
                 <dd class="mt-1 text-sm text-gray-900">
                   <%= display_response_text(row_field, response) %>
                 </dd>
@@ -72,7 +74,7 @@
         <% else %>
           <% response = @responses[field.id] %>
           <div class="py-2">
-            <dt class="text-xs font-medium text-gray-500 uppercase tracking-wide"><%= field.question %></dt>
+            <dt class="text-xs font-medium text-gray-500 uppercase tracking-wide"><%= field.name %></dt>
             <dd class="mt-1 text-sm text-gray-900">
               <%= display_response_text(field, response) %>
             </dd>
@@ -82,7 +84,7 @@
 
       <div class="pt-4 border-t border-gray-200 mt-4">
         <p class="text-xs text-gray-500">
-          Submitted on <%= @person_form.created_at.strftime("%B %d, %Y at %l:%M %P") %>
+          Submitted on <%= @form_submission.created_at.strftime("%B %d, %Y at %l:%M %P") %>
         </p>
       </div>
     </div>
diff --git a/app/views/forms/_form_field_fields.html.erb b/app/views/forms/_form_field_fields.html.erb
new file mode 100644
index 000000000..50dfd5e44
--- /dev/null
+++ b/app/views/forms/_form_field_fields.html.erb
@@ -0,0 +1,75 @@
+<%
+  field = f.object
+
+  visibility_options = [
+    [ "Always ask", "always_ask" ],
+    [ "Scholarship-only", "scholarship_only" ],
+    [ "Logged out only", "logged_out_only" ],
+    [ "Answers on file", "answers_on_file" ]
+  ]
+
+  visibility_styles = {
+    always_ask: "bg-white text-gray-600 border-gray-300",
+    scholarship_only: "bg-purple-100 text-purple-700 border-purple-200",
+    logged_out_only: "bg-emerald-100 text-emerald-700 border-emerald-200",
+    answers_on_file: "bg-amber-100 text-amber-700 border-amber-200"
+  }
+%>
+<div class="nested-fields flex items-center gap-3 <%= field.group_header? ? 'pl-3 pr-6' : 'px-6' %> py-3 border-b border-gray-100 hover:bg-gray-50"
+     data-sortable-id="<%= field.id %>"
+     <% if field.section.present? %>data-section="<%= field.section %>"<% end %>
+     <% if field.group_header? %>data-group-header<% end %>>
+  <div class="cursor-grab text-gray-400 hover:text-gray-600" data-sortable-handle>
+    <i class="fa-solid fa-grip-vertical"></i>
+  </div>
+
+  <%= f.hidden_field :id if field.persisted? %>
+  <%= f.hidden_field :position, value: field.position %>
+
+  <% if field.group_header? %>
+    <div class="flex-1 flex items-center gap-3">
+      <%= f.select :visibility, visibility_options,
+            {},
+            class: "text-xs rounded-full border px-2 py-0.5 cursor-pointer",
+            data: { controller: "chip-select", chip_select_styles_value: visibility_styles, action: "chip-select#update" } %>
+      <%= f.text_field :name, required: true, class: "flex-1 text-lg font-semibold text-gray-800 rounded border-gray-300 shadow-sm px-2 py-1" %>
+      <div class="ml-auto">
+        <%= link_to_remove_association "Remove", f,
+              class: "text-sm text-gray-400 hover:text-red-600 underline" %>
+      </div>
+    </div>
+  <% else %>
+    <div class="flex-1 flex flex-wrap items-center gap-2">
+      <%= f.select :visibility, visibility_options,
+            {},
+            class: "text-xs rounded-full border px-2 py-0.5 shrink-0 cursor-pointer",
+            data: { controller: "chip-select", chip_select_styles_value: visibility_styles, action: "chip-select#update" } %>
+      <%= f.text_field :name, required: true, class: "min-w-0 flex-[3_1_10rem] rounded border-gray-300 shadow-sm px-2 py-1 text-sm" %>
+      <%
+        type_order = %w[free_form_input_one_line free_form_input_paragraph multiple_choice_radio multiple_choice_checkbox no_user_input group_header]
+        type_labels = {
+          "group_header" => "Section header",
+          "free_form_input_one_line" => "One line",
+          "free_form_input_paragraph" => "Paragraph",
+          "multiple_choice_radio" => "Multiple choice radio",
+          "multiple_choice_checkbox" => "Multiple choice checkbox",
+          "no_user_input" => "Informational-only"
+        }
+        type_options = type_order.map { |t| [ type_labels[t] || t.titleize.gsub("_", " "), t ] }
+      %>
+      <%= f.select :answer_type, type_options,
+            {},
+            class: "flex-[2_1_11rem] rounded border-gray-300 shadow-sm px-2 py-1 text-sm" %>
+      <label class="flex items-center gap-1 text-sm text-gray-600 shrink-0">
+        <%= f.check_box :required, class: "rounded border-gray-300 text-blue-600" %>
+        Required
+      </label>
+      <label class="flex items-center gap-1 text-sm text-gray-600 shrink-0" title="Hide if already answered on any form (not just this event)">
+        <%= f.check_box :one_time, class: "rounded border-gray-300 text-amber-600" %>
+        One-time
+      </label>
+      <%= link_to_remove_association "Remove", f,
+            class: "text-sm text-gray-400 hover:text-red-600 underline shrink-0 ml-auto" %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/forms/edit.html.erb b/app/views/forms/edit.html.erb
new file mode 100644
index 000000000..1c4aa6951
--- /dev/null
+++ b/app/views/forms/edit.html.erb
@@ -0,0 +1,88 @@
+<div class="max-w-4xl mx-auto py-8 px-4">
+  <div class="flex flex-wrap items-center justify-end gap-2 mb-4">
+    <%= link_to "Forms", forms_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
+    <%= link_to "View form", form_path(@form), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
+    <%= link_to "Edit sections", edit_sections_form_path(@form), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
+  </div>
+  <h1 class="text-2xl font-semibold mb-6">Edit: <%= @form.display_name %></h1>
+
+  <%= form_with model: @form, class: "space-y-6" do |f| %>
+    <% if @form.errors.any? %>
+      <div class="rounded-lg bg-red-50 border border-red-200 p-4">
+        <p class="text-sm font-medium text-red-800">
+          <%= pluralize(@form.errors.count, "error") %> prevented this form from being saved:
+        </p>
+        <ul class="mt-1 text-sm text-red-700 list-disc list-inside">
+          <% @form.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+
+    <div class="bg-white border border-gray-200 rounded-xl shadow-sm p-6 space-y-4">
+      <div>
+        <label class="block text-sm font-medium text-gray-700 mb-1">Form Name</label>
+        <%= f.text_field :name, class: "w-full rounded border-gray-300 shadow-sm px-3 py-2 text-sm" %>
+      </div>
+
+      <div class="flex flex-wrap gap-x-6 gap-y-2">
+        <label class="flex items-center gap-2 cursor-pointer">
+          <%= f.check_box :hide_answered_person_questions, class: "rounded border-gray-300 text-blue-600" %>
+          <span class="text-sm text-gray-800">Hide any answered person & organization questions</span>
+        </label>
+        <label class="flex items-center gap-2 cursor-pointer">
+          <%= f.check_box :hide_answered_form_questions, class: "rounded border-gray-300 text-blue-600" %>
+          <span class="text-sm text-gray-800">Hide any questions the user already answered</span>
+        </label>
+      </div>
+    </div>
+
+    <div class="bg-white border border-gray-200 rounded-xl shadow-sm overflow-hidden">
+      <div class="px-6 py-4 border-b border-gray-100 flex items-center justify-between">
+        <h2 class="text-lg font-semibold">Fields</h2>
+        <span class="text-sm text-gray-500"><%= @form_fields.size %> fields</span>
+      </div>
+
+      <div class="px-6 py-3 border-b border-gray-100">
+        <p class="text-xs font-medium text-gray-500 mb-1.5">Conditional visibility</p>
+        <div class="flex flex-col gap-1">
+          <div class="flex items-center gap-1.5">
+            <span class="text-xs px-1.5 py-0.5 rounded-full bg-white text-gray-600 border border-gray-300">Always ask</span>
+            <span class="text-xs text-gray-500">Always shown to all users</span>
+          </div>
+          <div class="flex items-center gap-1.5">
+            <span class="text-xs px-1.5 py-0.5 rounded-full bg-purple-100 text-purple-700">Scholarship-only</span>
+            <span class="text-xs text-gray-500">Shown only when registering for scholarship</span>
+          </div>
+          <div class="flex items-center gap-1.5">
+            <span class="text-xs px-1.5 py-0.5 rounded-full bg-emerald-100 text-emerald-700">Logged out only</span>
+            <span class="text-xs text-gray-500">Hidden for logged-in users</span>
+          </div>
+          <div class="flex items-center gap-1.5">
+            <span class="text-xs px-1.5 py-0.5 rounded-full bg-amber-100 text-amber-700">Answers on file</span>
+            <span class="text-xs text-gray-500">Hidden when answered on this event's forms; if "One-time", hidden when answered on any form</span>
+          </div>
+        </div>
+      </div>
+
+      <div data-controller="form-fields-sortable" data-form-fields-sortable-url-value="<%= reorder_fields_form_path(@form) %>">
+        <%= f.fields_for :form_fields, @form_fields do |ff| %>
+          <%= render "form_field_fields", f: ff %>
+        <% end %>
+      </div>
+
+      <div class="px-6 py-3 border-t border-gray-100">
+        <%= link_to_add_association "+ Add field", f, :form_fields,
+              data: { association_insertion_node: "[data-controller='form-fields-sortable']",
+                      association_insertion_method: "append" },
+              class: "text-sm text-blue-600 hover:text-blue-800 font-medium" %>
+      </div>
+    </div>
+
+    <div class="flex gap-3">
+      <%= f.submit "Save Changes", class: "btn btn-primary cursor-pointer" %>
+      <%= link_to "Cancel", forms_path, class: "btn btn-secondary-outline" %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/forms/edit_sections.html.erb b/app/views/forms/edit_sections.html.erb
new file mode 100644
index 000000000..62c976c4b
--- /dev/null
+++ b/app/views/forms/edit_sections.html.erb
@@ -0,0 +1,36 @@
+<div class="max-w-2xl mx-auto py-8 px-4">
+  <div class="flex flex-wrap items-center justify-end gap-2 mb-4">
+    <%= link_to "Forms", forms_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
+    <%= link_to "Edit fields", edit_form_path(@form), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
+    <%= link_to "View form", form_path(@form), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
+  </div>
+  <h1 class="text-2xl font-semibold mb-6">Edit Sections: <%= @form.display_name %></h1>
+
+  <% current_sections = (@form.sections || []).map(&:to_s) %>
+
+  <%= form_with url: update_sections_form_path(@form), method: :patch, class: "space-y-6" do |f| %>
+    <fieldset>
+      <legend class="text-sm font-medium text-gray-700 mb-3">Select sections to include:</legend>
+      <div class="space-y-2">
+        <% FormBuilderService::SECTIONS.each do |key, section| %>
+          <label class="flex items-center gap-2 cursor-pointer">
+            <input type="checkbox" name="sections[]" value="<%= key %>"
+                   class="rounded border-gray-300 text-blue-600"
+                   <%= "checked" if current_sections.include?(key.to_s) %>>
+            <span class="text-sm text-gray-800"><%= section[:label] %></span>
+          </label>
+        <% end %>
+      </div>
+    </fieldset>
+
+    <p class="text-xs text-gray-500">
+      Unchecking a section will remove its fields from the form. Checking a new section will add its default fields at the end.
+      Existing answers are preserved via question text snapshots.
+    </p>
+
+    <div class="flex gap-3">
+      <%= f.submit "Update Sections", class: "btn btn-primary cursor-pointer" %>
+      <%= link_to "Cancel", edit_form_path(@form), class: "btn btn-secondary-outline" %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/forms/index.html.erb b/app/views/forms/index.html.erb
new file mode 100644
index 000000000..303ba23a1
--- /dev/null
+++ b/app/views/forms/index.html.erb
@@ -0,0 +1,34 @@
+<div class="max-w-5xl mx-auto py-8 px-4">
+  <div class="flex items-center justify-between mb-6">
+    <h1 class="text-2xl font-semibold">Forms</h1>
+    <%= link_to "New Form", new_form_path, class: "btn btn-primary" %>
+  </div>
+
+  <div class="bg-white border border-gray-200 rounded-xl shadow-sm overflow-hidden">
+    <table class="w-full border-collapse">
+      <thead class="bg-gray-100">
+        <tr>
+          <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700">Name</th>
+          <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700">Fields</th>
+          <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700">Events</th>
+          <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700">Submissions</th>
+          <th class="px-4 py-2"></th>
+        </tr>
+      </thead>
+      <tbody class="divide-y divide-gray-200">
+        <% @forms.each do |form| %>
+          <tr class="hover:bg-gray-50">
+            <td class="px-4 py-2 text-sm font-medium text-gray-900"><%= form.display_name %></td>
+            <td class="px-4 py-2 text-sm text-gray-600"><%= form.form_fields.size %></td>
+            <td class="px-4 py-2 text-sm text-gray-600"><%= form.events.size %></td>
+            <td class="px-4 py-2 text-sm text-gray-600"><%= form.form_submissions.size %></td>
+            <td class="px-4 py-2 text-right text-sm space-x-3">
+              <%= link_to "View", form_path(form), class: "text-blue-600 hover:text-blue-800 underline" %>
+              <%= link_to "Edit", edit_form_path(form), class: "text-blue-600 hover:text-blue-800 underline" %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/app/views/forms/new.html.erb b/app/views/forms/new.html.erb
new file mode 100644
index 000000000..eb123abfe
--- /dev/null
+++ b/app/views/forms/new.html.erb
@@ -0,0 +1,39 @@
+<div class="max-w-2xl mx-auto py-8 px-4">
+  <h1 class="text-2xl font-semibold mb-6">New Form</h1>
+
+  <%= form_with url: forms_path, method: :post, class: "space-y-6" do |f| %>
+    <div>
+      <label class="block text-sm font-medium text-gray-700 mb-1">Form Name</label>
+      <input type="text" name="name" value="<%= params[:name] %>"
+             class="w-full rounded border-gray-300 shadow-sm px-3 py-2 text-sm"
+             placeholder="e.g. Short Event Registration">
+    </div>
+
+    <fieldset>
+      <legend class="text-sm font-medium text-gray-700 mb-3">Select sections to include:</legend>
+      <div class="space-y-2">
+        <% FormBuilderService::SECTIONS.each do |key, section| %>
+          <label class="flex items-center gap-2 cursor-pointer">
+            <input type="checkbox" name="sections[]" value="<%= key %>"
+                   class="rounded border-gray-300 text-blue-600"
+                   <%= "checked" if params.dig(:sections)&.include?(key.to_s) %>>
+            <span class="text-sm text-gray-800"><%= section[:label] %></span>
+          </label>
+        <% end %>
+      </div>
+    </fieldset>
+
+    <div>
+      <label class="flex items-center gap-2 cursor-pointer">
+        <input type="checkbox" name="scholarship_application" value="1"
+               class="rounded border-gray-300 text-blue-600">
+        <span class="text-sm text-gray-800">Scholarship application form</span>
+      </label>
+    </div>
+
+    <div class="flex gap-3">
+      <%= f.submit "Create Form", class: "btn btn-primary cursor-pointer" %>
+      <%= link_to "Cancel", forms_path, class: "btn btn-secondary-outline" %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/forms/show.html.erb b/app/views/forms/show.html.erb
new file mode 100644
index 000000000..f175d9756
--- /dev/null
+++ b/app/views/forms/show.html.erb
@@ -0,0 +1,158 @@
+<div class="max-w-2xl mx-auto py-8 px-4">
+  <div class="flex flex-wrap items-center justify-end gap-2 mb-4">
+    <%= link_to "Forms", forms_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
+    <%= link_to "Edit", edit_form_path(@form), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
+  </div>
+  <h1 class="text-2xl font-semibold mb-6"><%= @form.display_name %></h1>
+
+  <div class="bg-white rounded-xl shadow-lg overflow-hidden border border-gray-200">
+    <div class="bg-blue-900 text-white px-6 py-4">
+      <div class="flex items-center gap-8">
+        <div class="shrink-0">
+          <%= image_tag("logo.png", alt: "Organization logo", class: "h-8 w-auto") %>
+        </div>
+        <h2 class="text-xl font-semibold tracking-wide"><%= @form.display_name %></h2>
+      </div>
+    </div>
+
+    <div class="px-6 py-6">
+      <%
+        has_scholarship = @form.form_fields.where(visibility: :scholarship_only).exists?
+        has_logged_out = @form.form_fields.where(visibility: :logged_out_only).exists?
+        has_answers_on_file = @form.form_fields.where(visibility: :answers_on_file).exists?
+        has_conditions = has_scholarship || (has_logged_out && @form.hide_answered_person_questions?) || (has_answers_on_file && @form.hide_answered_form_questions?)
+
+        preview_logged_in = params[:preview_logged_in].present?
+        preview_scholarship = params[:preview_scholarship].present?
+        preview_answered = params[:preview_answered].present?
+      %>
+
+      <div class="mb-4 rounded-lg bg-blue-50 border border-blue-200 p-3 space-y-2">
+        <p class="text-xs font-medium text-blue-800">Preview mode</p>
+        <% if has_conditions %>
+          <p class="text-xs text-blue-600 mb-1">Toggle to simulate how the form appears under different conditions:</p>
+          <div class="flex flex-wrap gap-4">
+            <% if has_logged_out && @form.hide_answered_person_questions? %>
+              <%
+                logged_in_params = request.query_parameters.dup
+                if preview_logged_in
+                  logged_in_params.delete("preview_logged_in")
+                else
+                  logged_in_params["preview_logged_in"] = "1"
+                end
+              %>
+              <%= link_to form_path(@form, logged_in_params), class: "flex items-center gap-2 no-underline" do %>
+                <span class="text-xs text-blue-700">User logged in</span>
+                <span class="relative inline-block w-7 h-4 rounded-full <%= preview_logged_in ? 'bg-blue-600' : 'bg-gray-300' %>">
+                  <span class="absolute top-0.5 left-0.5 h-3 w-3 rounded-full bg-white shadow transition-transform duration-200 <%= preview_logged_in ? 'translate-x-3' : 'translate-x-0' %>"></span>
+                </span>
+              <% end %>
+            <% end %>
+            <% if has_answers_on_file && @form.hide_answered_form_questions? %>
+              <%
+                answered_params = request.query_parameters.dup
+                if preview_answered
+                  answered_params.delete("preview_answered")
+                else
+                  answered_params["preview_answered"] = "1"
+                end
+              %>
+              <%= link_to form_path(@form, answered_params), class: "flex items-center gap-2 no-underline" do %>
+                <span class="text-xs text-blue-700">Answers on file</span>
+                <span class="relative inline-block w-7 h-4 rounded-full <%= preview_answered ? 'bg-blue-600' : 'bg-gray-300' %>">
+                  <span class="absolute top-0.5 left-0.5 h-3 w-3 rounded-full bg-white shadow transition-transform duration-200 <%= preview_answered ? 'translate-x-3' : 'translate-x-0' %>"></span>
+                </span>
+              <% end %>
+            <% end %>
+            <% if has_scholarship %>
+              <%
+                scholarship_params = request.query_parameters.dup
+                if preview_scholarship
+                  scholarship_params.delete("preview_scholarship")
+                else
+                  scholarship_params["preview_scholarship"] = "1"
+                end
+              %>
+              <%= link_to form_path(@form, scholarship_params), class: "flex items-center gap-2 no-underline" do %>
+                <span class="text-xs text-blue-700">Scholarship</span>
+                <span class="relative inline-block w-7 h-4 rounded-full <%= preview_scholarship ? 'bg-blue-600' : 'bg-gray-300' %>">
+                  <span class="absolute top-0.5 left-0.5 h-3 w-3 rounded-full bg-white shadow transition-transform duration-200 <%= preview_scholarship ? 'translate-x-3' : 'translate-x-0' %>"></span>
+                </span>
+              <% end %>
+            <% end %>
+          </div>
+        <% else %>
+          <p class="text-xs text-blue-600">No conditional visibility configured. All fields always shown.</p>
+        <% end %>
+      </div>
+
+      <%
+        fields_by_id_check = @form_fields.select(&:field_identifier).index_by(&:field_identifier)
+        email_row = if fields_by_id_check["confirm_email"] && fields_by_id_check["primary_email_type"]
+          { keys: %w[primary_email confirm_email primary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4" }
+        elsif fields_by_id_check["confirm_email"]
+          { keys: %w[primary_email confirm_email], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" }
+        else
+          { keys: %w[primary_email primary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "primary_email" => "md:col-span-2" } }
+        end
+
+        row_groups = [
+          { keys: %w[first_name last_name], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
+          { keys: %w[nickname pronouns], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
+          email_row,
+          { keys: %w[secondary_email secondary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "secondary_email" => "md:col-span-2" } },
+          { keys: %w[mailing_street mailing_address_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
+          { keys: %w[mailing_city mailing_state mailing_zip], grid: "grid grid-cols-1 md:grid-cols-3 gap-4" },
+          { keys: %w[phone phone_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
+          { keys: %w[agency_name agency_position], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
+          { keys: %w[agency_city agency_state agency_zip], grid: "grid grid-cols-1 md:grid-cols-3 gap-4" },
+          { keys: %w[number_of_attendees payment_method], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" }
+        ]
+
+        identifier_to_group = {}
+        row_groups.each { |g| g[:keys].each { |k| identifier_to_group[k] = g } }
+
+        fields_by_identifier = @form_fields.select(&:field_identifier).index_by(&:field_identifier)
+        rendered_ids = {}
+
+        has_secondary_email = fields_by_identifier["secondary_email"].present?
+        email_label_overrides = if has_secondary_email
+          { "primary_email" => "Primary Email", "confirm_email" => "Confirm Primary Email", "primary_email_type" => "Primary Email Type" }
+        else
+          {}
+        end
+      %>
+
+      <fieldset disabled>
+        <% @form_fields.each do |field| %>
+          <% next if field.field_identifier.present? && rendered_ids[field.field_identifier] %>
+
+          <% if field.group_header? %>
+            <div class="pt-6 pb-2 border-b border-gray-200 mb-4">
+              <h3 class="text-lg font-semibold text-gray-800"><%= field.name %></h3>
+            </div>
+          <% elsif (group = field.field_identifier.present? && identifier_to_group[field.field_identifier]) %>
+            <div class="<%= group[:grid] %>">
+              <% group[:keys].each do |key| %>
+                <% row_field = fields_by_identifier[key] %>
+                <% next unless row_field %>
+                <% rendered_ids[key] = true %>
+                <% span = group.dig(:spans, key) %>
+                <% label_override = email_label_overrides[key] %>
+                <% if span %>
+                  <div class="<%= span %>">
+                    <%= render "events/public_registrations/form_field", field: row_field, value: nil, label: label_override %>
+                  </div>
+                <% else %>
+                  <%= render "events/public_registrations/form_field", field: row_field, value: nil, label: label_override %>
+                <% end %>
+              <% end %>
+            </div>
+          <% else %>
+            <%= render "events/public_registrations/form_field", field: field, value: nil %>
+          <% end %>
+        <% end %>
+      </fieldset>
+    </div>
+  </div>
+</div>
diff --git a/app/views/monthly_reports/_form.html.erb b/app/views/monthly_reports/_form.html.erb
index 097b2d934..085c787f5 100644
--- a/app/views/monthly_reports/_form.html.erb
+++ b/app/views/monthly_reports/_form.html.erb
@@ -122,8 +122,8 @@
          <% @report.log_fields.each do |field| %>
            <%= render 'shared/form_field', :field => field, :report => @report %>
 
-           <% if field.question == 'Share challenges for this month' ||
-    (field.question == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2) %>
+           <% if field.name == 'Share challenges for this month' ||
+    (field.name == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2) %>
              <br />
              <script>
                window.quotesIndex = 0;
diff --git a/app/views/monthly_reports/_report_form_field_answers.html.erb b/app/views/monthly_reports/_report_form_field_answers.html.erb
index dbd3d21db..831273aa6 100644
--- a/app/views/monthly_reports/_report_form_field_answers.html.erb
+++ b/app/views/monthly_reports/_report_form_field_answers.html.erb
@@ -8,25 +8,25 @@
 
   <div class="label-plus-comment">
     <% unless answers.include?(log_field.id) %>
-      <label class='bold'><%= "#{log_field.question}" %><% if log_field.is_required %><%= " *" %><% end %></label>
+      <label class='bold'><%= "#{log_field.name}" %><% if log_field.required %><%= " *" %><% end %></label>
     <% end %>
 
-    <% unless answers.include?(log_field.instructional_hint) %>
-      <div class='custom-smaller'><%= log_field.instructional_hint %></div>
+    <% unless answers.include?(log_field.hint_text) %>
+      <div class='custom-smaller'><%= log_field.hint_text %></div>
     <% end %>
   </div>
 
-  <% answers.push(log_field.id, log_field.instructional_hint) %>
+  <% answers.push(log_field.id, log_field.hint_text) %>
 
   <%= form.hidden_field :answer_option_id, id: "log-field-#{log_field.id}" %>
 
   <% if log_field.multiple_choice? %>
     <% answer_option = answer.answer_option %>
-    <% if log_field.input_type == :radio_button %>
+    <% if log_field.form_helper_type == :radio_button %>
       <% log_field.answer_options.each do |answer_option| %>
         <% next if answers.include?("#{answer_option.id}-#{log_field.id}") %>
         <% answers.push("#{answer_option.id}-#{log_field.id}") %>
-        <%= form.send(log_field.input_type, :_create, 1, onclick: 'deselectCheckboxesIfSelected($(this));', class: "js-answer-button-radio-#{log_field.id}", id: "js-answer-button-radio-#{answer_option.id}", data: { log_field_id: log_field.id }, checked: log_field.checked(@old_report, answer_option.name)) %>
+        <%= form.send(log_field.form_helper_type, :_create, 1, onclick: 'deselectCheckboxesIfSelected($(this));', class: "js-answer-button-radio-#{log_field.id}", id: "js-answer-button-radio-#{answer_option.id}", data: { log_field_id: log_field.id }, checked: log_field.checked(@old_report, answer_option.name)) %>
         <%= hidden_field({}, :answer_option_id, value: answer_option.id) %>
         <% label_txt = answer_option.name.titleize %>
         <% style = 'text-transform: uppercase;' if label_txt.downcase == 'lgbtqia' %>
@@ -35,9 +35,9 @@
       <% end %>
     <% else %>
       <div class='form-group'>
-        <%= form.send(log_field.input_type, :_create, checked: log_field.selected(@old_report, answer_option.id)) %>
+        <%= form.send(log_field.form_helper_type, :_create, checked: log_field.selected(@old_report, answer_option.id)) %>
         <label class='inline'><%= answer_option.name %></label>
-        <% if log_field.question == 'Workshop Details' %>
+        <% if log_field.name == 'Workshop Details' %>
           <br>
         <% end %>
         <%= form.hidden_field :answer_option_id, value: answer_option.id %>
@@ -45,13 +45,13 @@
     <% end %>
   <% else %>
     <div class='form-group'>
-      <% unless log_field.input_type == :hidden_field %>
-        <%= form.send(log_field.input_type, :answer, class: "#{log_field.question.downcase.gsub(' ', '-')} form-control", required: log_field.is_required, value: log_field.answer(@old_report)) %>
+      <% unless log_field.form_helper_type == :hidden_field %>
+        <%= form.send(log_field.form_helper_type, :answer, class: "#{log_field.name.downcase.gsub(' ', '-')} form-control", required: log_field.required, value: log_field.answer(@old_report)) %>
       <% end %>
     </div>
 
-    <% if log_field.question == 'Share challenges for this month' ||
-      (log_field.question == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2) %>
+    <% if log_field.name == 'Share challenges for this month' ||
+      (log_field.name == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2) %>
       <br />
       <script>
         window.quotesIndex = 0;
diff --git a/app/views/monthly_reports/edit.html.erb b/app/views/monthly_reports/edit.html.erb
index 3d68bc9f8..d37fd9d89 100644
--- a/app/views/monthly_reports/edit.html.erb
+++ b/app/views/monthly_reports/edit.html.erb
@@ -82,8 +82,8 @@ A monthly report has already been submitted for this month. Please contact your
           $("#Total--First-Time-Participants").prop("readonly", true);
         </script>
 
-        <% if field.question == 'Share challenges for this month' ||
-      (field.question == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2)%>
+        <% if field.name == 'Share challenges for this month' ||
+      (field.name == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2)%>
           <!-- QUOTES -->
 
           <script>
diff --git a/app/views/monthly_reports/show.html.erb b/app/views/monthly_reports/show.html.erb
index 20eea8b7d..62fff51cb 100644
--- a/app/views/monthly_reports/show.html.erb
+++ b/app/views/monthly_reports/show.html.erb
@@ -100,7 +100,7 @@
           <h2 class="text-lg font-semibold text-gray-800 mb-2">Responses</h2>
           <% @answers.each do |answer| %>
             <div class="border-b border-gray-200 pb-2">
-              <p class="text-sm font-semibold text-gray-700"><%= answer.form_field.question %></p>
+              <p class="text-sm font-semibold text-gray-700"><%= answer.form_field.name %></p>
               <p class="text-gray-800"><%= answer.response.presence || "—" %></p>
             </div>
           <% end %>
diff --git a/app/views/reports/edit.html.erb b/app/views/reports/edit.html.erb
index 1b2cf7f7b..a0c8b78fa 100644
--- a/app/views/reports/edit.html.erb
+++ b/app/views/reports/edit.html.erb
@@ -65,8 +65,8 @@
           $("#Total--First-Time-Participants").prop("readonly", true);
         </script>
 
-        <% if field.question == 'Share challenges for this month' ||
-      (field.question == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2)%>
+        <% if field.name == 'Share challenges for this month' ||
+      (field.name == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2)%>
           <!-- QUOTES -->
 
           <script>
diff --git a/app/views/reports/show.html.erb b/app/views/reports/show.html.erb
index cf0ff7ac0..8577fb245 100644
--- a/app/views/reports/show.html.erb
+++ b/app/views/reports/show.html.erb
@@ -100,7 +100,7 @@
           <h2 class="text-lg font-semibold text-gray-800 mb-2">Responses</h2>
           <% @answers.each do |answer| %>
             <div class="border-b border-gray-200 pb-2">
-              <p class="text-sm font-semibold text-gray-700"><%= answer.form_field.question %></p>
+              <p class="text-sm font-semibold text-gray-700"><%= answer.form_field.name %></p>
               <p class="text-gray-800"><%= answer.response.presence || "—" %></p>
             </div>
           <% end %>
diff --git a/app/views/shared/_form_field.html.erb b/app/views/shared/_form_field.html.erb
index 85f65cd43..72f6dbcf5 100644
--- a/app/views/shared/_form_field.html.erb
+++ b/app/views/shared/_form_field.html.erb
@@ -1,14 +1,14 @@
 <% case field.html_input_type %>
 <% when :label %>
   <div class="label-plus-comment">
-    <label><%= field.question %> <%= "*" if field.is_required? %></label>
-    <div class="custom-smaller"> <%= field.instructional_hint %> </div>
+    <label><%= field.name %> <%= "*" if field.required? %></label>
+    <div class="custom-smaller"> <%= field.hint_text %> </div>
   </div>
 
 <% when :group_header %>
   <div class="label-plus-comment">
-    <label><%= field.question %> </label>
-    <div class="custom-smaller"><%= field.instructional_hint %></div>
+    <label><%= field.name %> </label>
+    <div class="custom-smaller"><%= field.hint_text %></div>
       <div class="custom-smaller">(No percentages please. Enter 1 instead of 1/2)</div>
   </div>
 
@@ -18,16 +18,16 @@
         <% field.childs.each do |f| %>
           <div class="form-group text-form-group">
             <div class="label-plus-comment">
-              <label><%= f.question %></label>
+              <label><%= f.name %></label>
               <div class="custom-smaller">
-                <%= f.instructional_hint %>
+                <%= f.hint_text %>
               </div>
             </div>
 
             <input type="text"
              name="log_fields[<%= f.id %>]" class="form-control"
-             id="<%= f.question.downcase.tr(" /", "_") %>"
-             <%= 'required' if f.is_required %>
+             id="<%= f.name.downcase.tr(" /", "_") %>"
+             <%= 'required' if f.required %>
              oninvalid="scroll_here(this);"
              value="<%= f.answer( report ) %>"
              onkeyup="setNumberParticipantsLeft(this);"
@@ -43,26 +43,26 @@
 <% when :text %>
   <div class="form-group <%= field.html_input_type %>-form-group">
     <div class="label-plus-comment">
-      <label><%= field.question %> <%= "*" if field.is_required? %></label>
-      <div class="custom-smaller"> <%= field.instructional_hint %> </div>
+      <label><%= field.name %> <%= "*" if field.required? %></label>
+      <div class="custom-smaller"> <%= field.hint_text %> </div>
     </div>
 
     <input type="<%= field.html_input_type %>"
      name="log_fields[<%= field.id %>]" class="form-control"
-     <%= 'required' if field.is_required %>
+     <%= 'required' if field.required %>
      oninvalid="scroll_here(this);" value="<%= field.answer( report ) %>"
-     id="<%= field.question.tr(" ", "-").tr("#","") %>"/>
+     id="<%= field.name.tr(" ", "-").tr("#","") %>"/>
   </div>
 
 <% when :textarea %>
   <div class="form-group <%= field.html_input_type %>-form-group">
 
     <div class="label-plus-comment">
-      <label><%= field.question %> <%= "*" if field.is_required? %></label>
-      <div class="custom-smaller"> <%= field.instructional_hint %> </div>
+      <label><%= field.name %> <%= "*" if field.required? %></label>
+      <div class="custom-smaller"> <%= field.hint_text %> </div>
     </div>
 
-    <textarea name="log_fields[<%= field.id %>]" class="form-control" <%= 'required=required' if field.is_required %>
+    <textarea name="log_fields[<%= field.id %>]" class="form-control" <%= 'required=required' if field.required %>
         oninvalid="scroll_here(this);"><%= field.answer( report ) if field.answer( report ) %></textarea>
   </div>
 
@@ -74,9 +74,9 @@
           <%= @count %>.
           <% @count +=1 %>
         <% end %>
-        <%= field.question %> <%= "*" if field.is_required? %>
+        <%= field.name %> <%= "*" if field.required? %>
       </label>
-      <div class="custom-smaller"> <%= field.instructional_hint %> </div>
+      <div class="custom-smaller"> <%= field.hint_text %> </div>
     </div>
 
     <% field.answer_options.each do |answer_option| %>
diff --git a/app/views/shared/_report_form_field_answers.html.erb b/app/views/shared/_report_form_field_answers.html.erb
index c23a7b4b6..f4e070be1 100644
--- a/app/views/shared/_report_form_field_answers.html.erb
+++ b/app/views/shared/_report_form_field_answers.html.erb
@@ -8,25 +8,25 @@
 
   <div class="label-plus-comment">
     <% unless answers.include?(log_field.id) %>
-      <label class='bold'><%= "#{log_field.question}" %><% if log_field.is_required %><%= " *" %><% end %></label>
+      <label class='bold'><%= "#{log_field.name}" %><% if log_field.required %><%= " *" %><% end %></label>
     <% end %>
 
-    <% unless answers.include?(log_field.instructional_hint) %>
-      <div class='custom-smaller'><%= log_field.instructional_hint %></div>
+    <% unless answers.include?(log_field.hint_text) %>
+      <div class='custom-smaller'><%= log_field.hint_text %></div>
     <% end %>
   </div>
 
-  <% answers.push(log_field.id, log_field.instructional_hint) %>
+  <% answers.push(log_field.id, log_field.hint_text) %>
 
   <%= form.hidden_field :answer_option_id, id: "log-field-#{log_field.id}" %>
 
   <% if log_field.multiple_choice? %>
     <% answer_option = answer.answer_option %>
-    <% if log_field.input_type == :radio_button %>
+    <% if log_field.form_helper_type == :radio_button %>
       <% log_field.answer_options.each do |answer_option| %>
         <% next if answers.include?("#{answer_option.id}-#{log_field.id}") %>
         <% answers.push("#{answer_option.id}-#{log_field.id}") %>
-        <%= form.send(log_field.input_type, :_create, 1, onclick: 'deselectCheckboxesIfSelected($(this));', class: "js-answer-button-radio-#{log_field.id}", id: "js-answer-button-radio-#{answer_option.id}", data: { log_field_id: log_field.id }, checked: log_field.checked(@old_report, answer_option.name)) %>
+        <%= form.send(log_field.form_helper_type, :_create, 1, onclick: 'deselectCheckboxesIfSelected($(this));', class: "js-answer-button-radio-#{log_field.id}", id: "js-answer-button-radio-#{answer_option.id}", data: { log_field_id: log_field.id }, checked: log_field.checked(@old_report, answer_option.name)) %>
         <%= hidden_field({}, :answer_option_id, value: answer_option.id) %>
         <% label_txt = answer_option.name.titleize %>
         <% style = 'text-transform: uppercase;' if label_txt.downcase == 'lgbtqia' %>
@@ -35,9 +35,9 @@
       <% end %>
     <% else %>
       <div class='form-group'>
-        <%= form.send(log_field.input_type, :_create, checked: log_field.selected(@old_report, answer_option.id)) %>
+        <%= form.send(log_field.form_helper_type, :_create, checked: log_field.selected(@old_report, answer_option.id)) %>
         <label class='inline'><%= answer_option.name %></label>
-        <% if log_field.question == 'Workshop Details' %>
+        <% if log_field.name == 'Workshop Details' %>
           <br>
         <% end %>
         <%= form.hidden_field :answer_option_id, value: answer_option.id %>
@@ -45,13 +45,13 @@
     <% end %>
   <% else %>
     <div class='form-group'>
-      <% unless log_field.input_type == :hidden_field %>
-        <%= form.send(log_field.input_type, :answer, class: "#{log_field.question.downcase.gsub(' ', '-')} form-control", required: log_field.is_required, value: log_field.answer(@old_report)) %>
+      <% unless log_field.form_helper_type == :hidden_field %>
+        <%= form.send(log_field.form_helper_type, :answer, class: "#{log_field.name.downcase.gsub(' ', '-')} form-control", required: log_field.required, value: log_field.answer(@old_report)) %>
       <% end %>
     </div>
 
-    <% if log_field.question == 'Share challenges for this month' ||
-      (log_field.question == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2) %>
+    <% if log_field.name == 'Share challenges for this month' ||
+      (log_field.name == 'Anything we can do to help you?' and params[:form_builder_id].to_i == 2) %>
       <br />
       <script>
         window.quotesIndex = 0;
diff --git a/app/views/shared/_user_form_form_fields.html.erb b/app/views/shared/_user_form_form_fields.html.erb
index 371f9e1f1..c06bf61a9 100644
--- a/app/views/shared/_user_form_form_fields.html.erb
+++ b/app/views/shared/_user_form_form_fields.html.erb
@@ -1,3 +1,3 @@
-<%= f.label f.object.form_field.question %>
+<%= f.label f.object.form_field.name %>
 <%= f.text_area :text %>
 <%= f.hidden_field :form_field_id %> 
\ No newline at end of file
diff --git a/app/views/workshop_logs/_report_form_field_answer_fields.html.erb b/app/views/workshop_logs/_report_form_field_answer_fields.html.erb
index a15d28f1a..fbe1c1fc8 100644
--- a/app/views/workshop_logs/_report_form_field_answer_fields.html.erb
+++ b/app/views/workshop_logs/_report_form_field_answer_fields.html.erb
@@ -11,17 +11,17 @@
                   label_method: :name,
                   value_method: :id,
                   include_blank: "Select an option",
-                  label: f.object.form_field&.question,
-                  required: f.object.form_field&.is_required?,
-                  hint: f.object.form_field.instructional_hint,
+                  label: f.object.form_field&.name,
+                  required: f.object.form_field&.required?,
+                  hint: f.object.form_field.hint_text,
                   input_html: { class: "form-control mb-2" } %>
     <% else %>
       <!-- Freeform text with 3 rows -->
       <%= f.input :answer,
-                  label: f.object.form_field&.question,
+                  label: f.object.form_field&.name,
                   placeholder: "Enter response...",
-                  required: f.object.form_field&.is_required?,
-                  hint: f.object.form_field.instructional_hint,
+                  required: f.object.form_field&.required?,
+                  hint: f.object.form_field.hint_text,
                   input_html: { class: "form-control mb-2", rows: 3 } %>
     <% end %>
     <% if f.object.errors[:answer].any? %>
diff --git a/app/views/workshop_logs/show.html.erb b/app/views/workshop_logs/show.html.erb
index 3318e59fb..48a16944a 100644
--- a/app/views/workshop_logs/show.html.erb
+++ b/app/views/workshop_logs/show.html.erb
@@ -143,7 +143,7 @@
         <h2 class="text-lg font-semibold text-gray-800 mb-2">Responses</h2>
         <% @answers.each do |answer| %>
           <div class="border-b border-gray-200 pb-2">
-            <p class="text-sm font-semibold text-gray-700"><%= answer.form_field.question %></p>
+            <p class="text-sm font-semibold text-gray-700"><%= answer.form_field.name %></p>
             <p class="text-gray-800"><%= answer.response.presence || "—" %></p>
           </div>
         <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 317d82d4f..431ab72dc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -99,6 +99,14 @@
     end
     resources :comments, only: [ :index, :create ]
   end
+  resources :forms do
+    member do
+      patch :reorder_field
+      put :reorder_fields
+      get :edit_sections
+      patch :update_sections
+    end
+  end
   resources :events do
     member do
       get :manage
diff --git a/db/migrate/20260310113404_consolidate_form_builder.rb b/db/migrate/20260310113404_consolidate_form_builder.rb
new file mode 100644
index 000000000..573751dab
--- /dev/null
+++ b/db/migrate/20260310113404_consolidate_form_builder.rb
@@ -0,0 +1,44 @@
+class ConsolidateFormBuilder < ActiveRecord::Migration[8.0]
+  def change
+    # Rename tables
+    rename_table :person_forms, :form_submissions
+    rename_table :person_form_form_fields, :form_answers
+
+    # Rename foreign key column to match new table name
+    rename_column :form_answers, :person_form_id, :form_submission_id
+
+    # Snapshot of question name at submission time
+    add_column :form_answers, :question_name_when_answered, :string
+
+    # Allow form_field deletion without orphaning answers
+    change_column_null :form_answers, :form_field_id, true
+
+    # Add sections and conditional visibility to forms
+    add_column :forms, :sections, :json
+    add_column :forms, :hide_answered_person_questions, :boolean, default: false, null: false
+    add_column :forms, :hide_answered_form_questions, :boolean, default: false, null: false
+
+    # Per-field conditional visibility
+    add_column :form_fields, :visibility, :integer, default: 0, null: false
+    add_column :form_fields, :one_time, :boolean, default: false, null: false
+
+    # Rename text to submitted_answer for clarity
+    rename_column :form_answers, :text, :submitted_answer
+
+    # Rename is_required to required
+    rename_column :form_fields, :is_required, :required
+
+    # Batch column renames for clarity
+    rename_column :form_fields, :question, :name
+    rename_column :form_fields, :field_group, :section
+    # answer_type keeps its original name
+    rename_column :form_fields, :instructional_hint, :hint_text
+    rename_column :form_fields, :answer_datatype, :input_type
+    rename_column :form_fields, :field_key, :field_identifier
+
+    # Enforce NOT NULL on required foreign keys
+    change_column_null :form_submissions, :form_id, false
+    change_column_null :form_submissions, :person_id, false
+    change_column_null :form_answers, :form_submission_id, false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 45964ab76..733eff97a 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[8.1].define(version: 2026_03_09_120000) do
+ActiveRecord::Schema[8.1].define(version: 2026_03_10_113404) do
   create_table "action_text_mentions", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.bigint "action_text_rich_text_id", null: false
     t.datetime "created_at", null: false
@@ -18,7 +18,6 @@
     t.string "mentionable_type", null: false
     t.datetime "updated_at", null: false
     t.index ["action_text_rich_text_id", "mentionable_type", "mentionable_id"], name: "index_at_mentions_on_rich_text_and_mentionable", unique: true
-    t.index ["action_text_rich_text_id"], name: "index_action_text_mentions_on_action_text_rich_text_id"
     t.index ["mentionable_type", "mentionable_id"], name: "index_action_text_mentions_on_mentionable"
   end
 
@@ -51,7 +50,7 @@
     t.datetime "created_at", precision: nil, null: false
     t.string "filename", null: false
     t.string "key", null: false
-    t.text "metadata"
+    t.text "metadata", size: :medium
     t.string "service_name", null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
@@ -64,8 +63,8 @@
 
   create_table "addresses", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "address_type"
-    t.bigint "addressable_id"
-    t.string "addressable_type"
+    t.bigint "addressable_id", null: false
+    t.string "addressable_type", null: false
     t.string "city", null: false
     t.string "country"
     t.string "county"
@@ -75,7 +74,7 @@
     t.integer "la_city_council_district"
     t.integer "la_service_planning_area"
     t.integer "la_supervisorial_district"
-    t.string "locality"
+    t.string "locality", null: false
     t.string "phone"
     t.boolean "primary", default: false, null: false
     t.string "state", null: false
@@ -139,7 +138,7 @@
     t.string "resource_type"
     t.datetime "time"
     t.bigint "user_id"
-    t.bigint "visit_id"
+    t.bigint "visit_id", null: false
     t.index ["name", "time"], name: "index_ahoy_events_on_name_and_time"
     t.index ["resource_id"], name: "index_ahoy_events_on_resource_id"
     t.index ["resource_type", "resource_id", "time"], name: "index_ahoy_events_on_resource_type_and_resource_id_and_time"
@@ -193,8 +192,7 @@
     t.string "title"
     t.string "type", default: "PrimaryAsset", null: false
     t.datetime "updated_at", null: false
-    t.index ["owner_id"], name: "index_assets_on_owner_id"
-    t.index ["owner_type"], name: "index_assets_on_owner_type"
+    t.index ["owner_type", "owner_id"], name: "index_assets_on_owner_type_and_owner_id"
     t.index ["type"], name: "index_assets_on_type"
   end
 
@@ -204,19 +202,19 @@
     t.string "file_file_name"
     t.integer "file_file_size"
     t.datetime "file_updated_at", precision: nil
-    t.integer "owner_id"
-    t.string "owner_type"
+    t.integer "owner_id", null: false
+    t.string "owner_type", null: false
     t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "banners", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.text "content"
+    t.text "content", size: :medium, null: false
     t.datetime "created_at", precision: nil, null: false
-    t.integer "created_by_id"
+    t.integer "created_by_id", null: false
     t.boolean "published", default: false, null: false
-    t.boolean "show"
+    t.boolean "show", default: false, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.integer "updated_by_id"
+    t.integer "updated_by_id", null: false
     t.index ["created_by_id"], name: "index_banners_on_created_by_id"
     t.index ["published"], name: "index_banners_on_published"
     t.index ["updated_by_id"], name: "index_banners_on_updated_by_id"
@@ -279,7 +277,7 @@
   end
 
   create_table "bookmark_annotations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.text "annotation", size: :medium
+    t.text "annotation", size: :long
     t.integer "bookmark_id"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
@@ -287,48 +285,48 @@
   end
 
   create_table "bookmarks", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.integer "bookmarkable_id"
-    t.string "bookmarkable_type"
+    t.integer "bookmarkable_id", null: false
+    t.string "bookmarkable_type", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.integer "user_id"
+    t.integer "user_id", null: false
     t.index ["bookmarkable_type", "bookmarkable_id"], name: "index_bookmarks_on_bookmarkable"
     t.index ["user_id"], name: "index_bookmarks_on_user_id"
   end
 
   create_table "categories", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.integer "category_type_id"
+    t.integer "category_type_id", null: false
     t.datetime "created_at", precision: nil, null: false
     t.integer "legacy_id"
-    t.string "name"
+    t.string "name", null: false
     t.integer "position", null: false
-    t.boolean "published", default: false
+    t.boolean "published", default: false, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["category_type_id", "position"], name: "index_categories_on_category_type_id_and_position", unique: true
-    t.index ["category_type_id"], name: "index_categories_on_category_type_id"
+    t.index ["name"], name: "index_categories_on_name", unique: true
   end
 
   create_table "categorizable_items", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.integer "categorizable_id"
+    t.integer "categorizable_id", null: false
     t.string "categorizable_type"
-    t.integer "category_id"
+    t.integer "category_id", null: false
     t.datetime "created_at", precision: nil, null: false
     t.integer "legacy_id"
     t.datetime "updated_at", precision: nil, null: false
     t.index ["categorizable_type", "categorizable_id"], name: "idx_on_categorizable_type_categorizable_id_ccce65d80c"
     t.index ["category_id", "categorizable_type", "categorizable_id"], name: "index_categorizable_items_uniqueness", unique: true
-    t.index ["category_id"], name: "index_categorizable_items_on_category_id"
   end
 
   create_table "category_types", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.string "display_text"
     t.string "legacy_id"
-    t.string "name"
+    t.string "name", null: false
     t.boolean "profile_specific", default: false, null: false
-    t.boolean "published", default: false
-    t.boolean "story_specific", default: false
+    t.boolean "published", default: false, null: false
+    t.boolean "story_specific", default: false, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.index ["name"], name: "index_category_types_on_name", unique: true
   end
 
   create_table "ckeditor_assets", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
@@ -356,23 +354,22 @@
     t.datetime "updated_at", null: false
     t.integer "updated_by_id"
     t.index ["commentable_type", "commentable_id", "created_at"], name: "idx_on_commentable_type_commentable_id_created_at_89c6e27600"
-    t.index ["commentable_type", "commentable_id"], name: "index_comments_on_commentable"
     t.index ["created_by_id"], name: "index_comments_on_created_by_id"
     t.index ["updated_by_id"], name: "index_comments_on_updated_by_id"
   end
 
   create_table "community_news", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "author_id", null: false
-    t.text "body"
+    t.text "body", size: :medium
     t.datetime "created_at", null: false
     t.integer "created_by_id", null: false
-    t.boolean "featured"
+    t.boolean "featured", default: false, null: false
     t.integer "organization_id"
     t.boolean "publicly_featured", default: false, null: false
     t.boolean "publicly_visible", default: false, null: false
-    t.boolean "published"
+    t.boolean "published", default: false, null: false
     t.string "reference_url"
-    t.string "title"
+    t.string "title", null: false
     t.datetime "updated_at", null: false
     t.integer "updated_by_id", null: false
     t.integer "windows_type_id"
@@ -451,8 +448,8 @@
     t.integer "cost_cents"
     t.datetime "created_at", null: false
     t.integer "created_by_id"
-    t.text "description"
-    t.datetime "end_date", precision: nil
+    t.text "description", size: :medium
+    t.datetime "end_date", precision: nil, null: false
     t.boolean "featured", default: false, null: false
     t.boolean "inactive", default: true, null: false
     t.integer "location_id"
@@ -463,8 +460,8 @@
     t.boolean "publicly_visible", default: false, null: false
     t.boolean "published", default: false, null: false
     t.datetime "registration_close_date", precision: nil
-    t.datetime "start_date", precision: nil
-    t.string "title"
+    t.datetime "start_date", precision: nil, null: false
+    t.string "title", null: false
     t.datetime "updated_at", null: false
     t.string "videoconference_label", default: "Virtual event"
     t.string "videoconference_url"
@@ -474,13 +471,13 @@
   end
 
   create_table "faqs", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.text "answer", size: :medium
+    t.text "answer", size: :long, null: false
     t.datetime "created_at", precision: nil, null: false
-    t.boolean "inactive"
+    t.boolean "inactive", default: false, null: false
     t.integer "position", null: false
     t.boolean "publicly_visible", default: false, null: false
     t.boolean "published", default: false, null: false
-    t.string "question"
+    t.string "question", null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["published"], name: "index_faqs_on_published"
   end
@@ -494,53 +491,80 @@
     t.datetime "updated_at", precision: nil, null: false
   end
 
+  create_table "form_answers", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.integer "form_field_id"
+    t.bigint "form_submission_id", null: false
+    t.string "question_name_when_answered"
+    t.text "submitted_answer"
+    t.datetime "updated_at", null: false
+    t.index ["form_field_id"], name: "index_form_answers_on_form_field_id"
+    t.index ["form_submission_id"], name: "index_form_answers_on_form_submission_id"
+  end
+
   create_table "form_builders", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
-    t.text "description", size: :medium
-    t.string "name"
+    t.text "description", size: :long
+    t.string "name", null: false
     t.integer "owner_type"
     t.datetime "updated_at", precision: nil, null: false
-    t.integer "windows_type_id"
+    t.integer "windows_type_id", null: false
     t.index ["windows_type_id"], name: "index_form_builders_on_windows_type_id"
   end
 
   create_table "form_field_answer_options", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.integer "answer_option_id"
+    t.integer "answer_option_id", null: false
     t.datetime "created_at", precision: nil, null: false
-    t.integer "form_field_id"
+    t.integer "form_field_id", null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["answer_option_id"], name: "index_form_field_answer_options_on_answer_option_id"
     t.index ["form_field_id"], name: "index_form_field_answer_options_on_form_field_id"
   end
 
   create_table "form_fields", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.integer "answer_datatype"
     t.integer "answer_type"
     t.datetime "created_at", precision: nil, null: false
-    t.string "field_group"
-    t.string "field_key"
-    t.integer "form_id"
-    t.text "instructional_hint"
-    t.boolean "is_required", default: true
+    t.string "field_identifier"
+    t.integer "form_id", null: false
+    t.text "hint_text"
+    t.integer "input_type"
+    t.string "name", null: false
+    t.boolean "one_time", default: false, null: false
     t.integer "parent_id"
     t.integer "position"
-    t.string "question"
+    t.boolean "required", default: true
+    t.string "section"
     t.integer "status", default: 1
     t.datetime "updated_at", precision: nil, null: false
-    t.index ["field_group"], name: "index_form_fields_on_field_group"
-    t.index ["field_key"], name: "index_form_fields_on_field_key"
+    t.integer "visibility", default: 0, null: false
+    t.index ["field_identifier"], name: "index_form_fields_on_field_identifier"
     t.index ["form_id"], name: "index_form_fields_on_form_id"
+    t.index ["parent_id"], name: "index_form_fields_on_parent_id"
+    t.index ["section"], name: "index_form_fields_on_section"
+  end
+
+  create_table "form_submissions", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.integer "form_id", null: false
+    t.bigint "person_id", null: false
+    t.datetime "updated_at", null: false
+    t.index ["form_id"], name: "index_form_submissions_on_form_id"
+    t.index ["person_id"], name: "index_form_submissions_on_person_id"
   end
 
   create_table "forms", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "form_builder_id"
+    t.boolean "hide_answered_form_questions", default: false, null: false
+    t.boolean "hide_answered_person_questions", default: false, null: false
     t.string "name"
     t.integer "owner_id"
     t.string "owner_type"
     t.boolean "scholarship_application", default: false, null: false
+    t.json "sections"
     t.datetime "updated_at", precision: nil, null: false
     t.index ["form_builder_id"], name: "index_forms_on_form_builder_id"
+    t.index ["owner_type", "owner_id"], name: "index_forms_on_owner_type_and_owner_id"
   end
 
   create_table "images", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
@@ -559,8 +583,8 @@
   end
 
   create_table "locations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.string "city"
-    t.string "country"
+    t.string "city", null: false
+    t.string "country", null: false
     t.datetime "created_at", precision: nil, null: false
     t.string "state"
     t.datetime "updated_at", precision: nil, null: false
@@ -573,19 +597,20 @@
     t.datetime "file_updated_at", precision: nil
     t.integer "report_id"
     t.integer "workshop_log_id"
+    t.index ["report_id"], name: "index_media_files_on_report_id"
   end
 
   create_table "monthly_reports", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "best_call_time"
     t.boolean "call_requested"
-    t.text "comments", size: :medium
+    t.text "comments", size: :long
     t.datetime "created_at", precision: nil, null: false
-    t.text "goals", size: :medium
-    t.text "goals_reached", size: :medium
+    t.text "goals", size: :long
+    t.text "goals_reached", size: :long
     t.boolean "mail_evaluations"
     t.string "month"
-    t.text "most_challenging", size: :medium
-    t.text "most_effective", size: :medium
+    t.text "most_challenging", size: :long
+    t.text "most_effective", size: :long
     t.string "name"
     t.string "num_new_participants"
     t.string "num_ongoing_participants"
@@ -610,7 +635,7 @@
     t.string "kind", null: false
     t.integer "noticeable_id"
     t.string "noticeable_type"
-    t.integer "notification_type"
+    t.integer "notification_type", null: false
     t.integer "parent_notification_id"
     t.string "recipient_email", null: false
     t.string "recipient_role", null: false
@@ -632,9 +657,10 @@
 
   create_table "organization_statuses", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
-    t.string "name"
+    t.string "name", null: false
     t.boolean "published", default: false, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.index ["name"], name: "index_organization_statuses_on_name", unique: true
     t.index ["published"], name: "index_organization_statuses_on_published"
   end
 
@@ -642,17 +668,17 @@
     t.string "agency_type"
     t.string "agency_type_other"
     t.datetime "created_at", precision: nil, null: false
-    t.text "description", size: :medium
+    t.text "description", size: :long
     t.string "email"
     t.date "end_date"
     t.string "filemaker_code"
     t.string "internal_id"
-    t.boolean "legacy", default: false
+    t.boolean "legacy", default: false, null: false
     t.integer "legacy_id"
     t.integer "location_id"
     t.string "mission_vision_values"
-    t.string "name"
-    t.text "notes", size: :medium
+    t.string "name", null: false
+    t.text "notes", size: :long
     t.integer "organization_status_id"
     t.boolean "profile_show_description", default: true, null: false
     t.boolean "profile_show_email", default: true, null: false
@@ -692,16 +718,14 @@
     t.index ["event_id"], name: "index_payments_on_event_id"
     t.index ["payable_type", "payable_id", "status"], name: "index_payments_on_payable_type_and_payable_id_and_status"
     t.index ["payable_type", "payable_id"], name: "index_payments_on_payable"
-    t.index ["payable_type", "payable_id"], name: "index_payments_on_payable_type_and_payable_id"
     t.index ["payer_type", "payer_id"], name: "index_payments_on_payer"
-    t.index ["payer_type", "payer_id"], name: "index_payments_on_payer_type_and_payer_id"
-    t.index ["stripe_charge_id"], name: "index_payments_on_stripe_charge_id"
+    t.index ["stripe_charge_id"], name: "index_payments_on_stripe_charge_id", unique: true
     t.index ["stripe_payment_intent_id"], name: "index_payments_on_stripe_payment_intent_id", unique: true
   end
 
   create_table "people", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "best_time_to_call"
-    t.text "bio"
+    t.text "bio", size: :medium
     t.boolean "blog_contributor", default: false, null: false
     t.datetime "created_at", null: false
     t.integer "created_by_id"
@@ -752,32 +776,14 @@
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "person_form_form_fields", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.integer "form_field_id"
-    t.bigint "person_form_id"
-    t.text "text"
-    t.datetime "updated_at", null: false
-    t.index ["form_field_id"], name: "index_person_form_form_fields_on_form_field_id"
-    t.index ["person_form_id"], name: "index_person_form_form_fields_on_person_form_id"
-  end
-
-  create_table "person_forms", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.integer "form_id"
-    t.bigint "person_id"
-    t.datetime "updated_at", null: false
-    t.index ["form_id"], name: "index_person_forms_on_form_id"
-    t.index ["person_id"], name: "index_person_forms_on_person_id"
-  end
-
   create_table "quotable_item_quotes", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "legacy_id"
-    t.integer "quotable_id"
-    t.string "quotable_type"
-    t.integer "quote_id"
+    t.integer "quotable_id", null: false
+    t.string "quotable_type", null: false
+    t.integer "quote_id", null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.index ["quotable_type", "quotable_id"], name: "index_quotable_item_quotes_on_quotable_type_and_quotable_id"
     t.index ["quote_id"], name: "index_quotable_item_quotes_on_quote_id"
   end
 
@@ -785,11 +791,11 @@
     t.string "age"
     t.datetime "created_at", precision: nil, null: false
     t.string "gender", limit: 1
-    t.boolean "inactive", default: true
+    t.boolean "inactive", default: true, null: false
     t.boolean "legacy", default: false
     t.integer "legacy_id"
     t.boolean "published", default: false, null: false
-    t.text "quote", size: :medium
+    t.text "quote", size: :long
     t.string "speaker_name"
     t.datetime "updated_at", precision: nil, null: false
     t.integer "workshop_id"
@@ -798,11 +804,11 @@
   end
 
   create_table "report_form_field_answers", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.text "answer", size: :medium
+    t.text "answer", size: :long
     t.integer "answer_option_id"
     t.datetime "created_at", precision: nil
-    t.integer "form_field_id"
-    t.integer "report_id"
+    t.integer "form_field_id", null: false
+    t.integer "report_id", null: false
     t.datetime "updated_at", precision: nil
     t.index ["answer_option_id"], name: "index_report_form_field_answers_on_answer_option_id"
     t.index ["form_field_id"], name: "index_report_form_field_answers_on_form_field_id"
@@ -815,15 +821,15 @@
     t.integer "children_first_time", default: 0
     t.integer "children_ongoing", default: 0
     t.datetime "created_at", precision: nil, null: false
-    t.integer "created_by_id"
+    t.integer "created_by_id", null: false
     t.date "date"
     t.string "external_workshop_title"
     t.string "form_file_content_type"
     t.string "form_file_file_name"
     t.integer "form_file_file_size"
     t.datetime "form_file_updated_at", precision: nil
-    t.boolean "has_attachment", default: false
-    t.integer "organization_id"
+    t.boolean "has_attachment", default: false, null: false
+    t.integer "organization_id", null: false
     t.string "other_description"
     t.integer "owner_id"
     t.string "owner_type"
@@ -832,11 +838,12 @@
     t.integer "teens_ongoing", default: 0
     t.string "type"
     t.datetime "updated_at", precision: nil, null: false
-    t.integer "windows_type_id"
+    t.integer "windows_type_id", null: false
     t.integer "workshop_id"
     t.string "workshop_name"
     t.index ["created_by_id"], name: "index_reports_on_created_by_id"
     t.index ["organization_id"], name: "index_reports_on_organization_id"
+    t.index ["owner_type", "owner_id"], name: "index_reports_on_owner_type_and_owner_id"
     t.index ["type", "date"], name: "index_reports_on_type_and_date"
     t.index ["type", "organization_id"], name: "index_reports_on_type_and_organization_id"
     t.index ["windows_type_id"], name: "index_reports_on_windows_type_id"
@@ -846,28 +853,30 @@
   create_table "resources", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "agency"
     t.string "author"
-    t.text "body", size: :medium
+    t.text "body", size: :long
     t.datetime "created_at", precision: nil, null: false
-    t.integer "created_by_id"
+    t.integer "created_by_id", null: false
     t.boolean "featured", default: false
     t.boolean "female", default: false
     t.string "filemaker_code"
     t.boolean "inactive", default: true
-    t.string "kind"
+    t.string "kind", null: false
     t.boolean "legacy"
     t.integer "legacy_id"
     t.boolean "male", default: false
+    t.boolean "pdf_from_body", default: false, null: false
     t.integer "position"
     t.boolean "publicly_featured", default: false, null: false
     t.boolean "publicly_visible", default: false, null: false
     t.boolean "published", default: false, null: false
-    t.string "title"
+    t.string "title", null: false
     t.datetime "updated_at", precision: nil, null: false
     t.string "url"
     t.integer "windows_type_id"
     t.integer "workshop_id"
     t.index ["created_by_id"], name: "index_resources_on_created_by_id"
     t.index ["published"], name: "index_resources_on_published"
+    t.index ["title"], name: "index_resources_on_title", unique: true
     t.index ["windows_type_id"], name: "index_resources_on_windows_type_id"
     t.index ["workshop_id"], name: "index_resources_on_workshop_id"
   end
@@ -876,24 +885,24 @@
     t.datetime "created_at", precision: nil, null: false
     t.boolean "is_leader", default: false, null: false
     t.integer "sector_id"
-    t.integer "sectorable_id"
-    t.string "sectorable_type"
+    t.integer "sectorable_id", null: false
+    t.string "sectorable_type", null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["sector_id", "sectorable_type", "sectorable_id"], name: "index_sectorable_items_uniqueness", unique: true
-    t.index ["sector_id"], name: "index_sectorable_items_on_sector_id"
     t.index ["sectorable_type", "sectorable_id"], name: "index_sectorable_items_on_sectorable_type_and_sectorable_id"
   end
 
   create_table "sectors", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
-    t.string "name"
-    t.boolean "published", default: false
+    t.string "name", null: false
+    t.boolean "published", default: false, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.index ["name"], name: "index_sectors_on_name", unique: true
   end
 
   create_table "stories", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "author_credit_preference"
-    t.text "body"
+    t.text "body", size: :medium
     t.datetime "created_at", null: false
     t.integer "created_by_id", null: false
     t.string "external_workshop_title"
@@ -905,7 +914,7 @@
     t.boolean "published", default: false, null: false
     t.bigint "spotlighted_facilitator_id"
     t.bigint "story_idea_id"
-    t.string "title"
+    t.string "title", null: false
     t.datetime "updated_at", null: false
     t.integer "updated_by_id", null: false
     t.string "website_url"
@@ -917,14 +926,15 @@
     t.index ["published"], name: "index_stories_on_published"
     t.index ["spotlighted_facilitator_id"], name: "index_stories_on_spotlighted_facilitator_id"
     t.index ["story_idea_id"], name: "index_stories_on_story_idea_id"
+    t.index ["title"], name: "index_stories_on_title", unique: true
     t.index ["updated_by_id"], name: "index_stories_on_updated_by_id"
     t.index ["windows_type_id"], name: "index_stories_on_windows_type_id"
     t.index ["workshop_id"], name: "index_stories_on_workshop_id"
   end
 
   create_table "story_ideas", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.string "author_credit_preference"
-    t.text "body"
+    t.string "author_credit_preference", null: false
+    t.text "body", size: :medium
     t.datetime "created_at", null: false
     t.integer "created_by_id", null: false
     t.string "external_workshop_title"
@@ -945,19 +955,19 @@
 
   create_table "user_form_form_fields", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
-    t.integer "form_field_id"
-    t.text "text", size: :medium
+    t.integer "form_field_id", null: false
+    t.text "text", size: :long
     t.datetime "updated_at", precision: nil, null: false
-    t.integer "user_form_id"
+    t.integer "user_form_id", null: false
     t.index ["form_field_id"], name: "index_user_form_form_fields_on_form_field_id"
     t.index ["user_form_id"], name: "index_user_form_form_fields_on_user_form_id"
   end
 
   create_table "user_forms", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
-    t.integer "form_id"
+    t.integer "form_id", null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.integer "user_id"
+    t.integer "user_id", null: false
     t.index ["form_id"], name: "index_user_forms_on_form_id"
     t.index ["user_id"], name: "index_user_forms_on_user_id"
   end
@@ -983,7 +993,7 @@
     t.date "birthday"
     t.string "city"
     t.string "city2"
-    t.text "comment", size: :medium
+    t.text "comment", size: :long
     t.datetime "confirmation_sent_at"
     t.string "confirmation_token"
     t.datetime "confirmed_at"
@@ -1003,7 +1013,7 @@
     t.boolean "legacy", default: false
     t.integer "legacy_id"
     t.datetime "locked_at"
-    t.text "notes", size: :medium
+    t.text "notes", size: :long
     t.bigint "person_id"
     t.string "phone"
     t.string "phone2"
@@ -1031,7 +1041,7 @@
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["created_by_id"], name: "index_users_on_created_by_id"
     t.index ["email"], name: "index_users_on_email", unique: true
-    t.index ["person_id"], name: "index_users_on_person_id"
+    t.index ["person_id"], name: "index_users_on_person_id_unique", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
     t.index ["unlock_token"], name: "index_users_on_unlock_token", unique: true
     t.index ["updated_by_id"], name: "index_users_on_updated_by_id"
@@ -1048,21 +1058,21 @@
     t.boolean "publicly_featured", default: false, null: false
     t.boolean "publicly_visible", default: false, null: false
     t.boolean "published", default: false, null: false
-    t.string "title"
+    t.string "title", null: false
     t.datetime "updated_at", null: false
     t.string "youtube_url"
     t.index ["featured"], name: "index_video_recordings_on_featured"
     t.index ["is_instructional"], name: "index_video_recordings_on_is_instructional"
     t.index ["is_podcast"], name: "index_video_recordings_on_is_podcast"
     t.index ["published"], name: "index_video_recordings_on_published"
-    t.index ["title"], name: "index_video_recordings_on_title"
+    t.index ["title"], name: "index_video_recordings_on_title", unique: true
   end
 
   create_table "windows_types", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "legacy_id"
-    t.string "name"
-    t.string "short_name"
+    t.string "name", null: false
+    t.string "short_name", null: false
     t.datetime "updated_at", precision: nil, null: false
   end
 
@@ -1076,37 +1086,37 @@
   end
 
   create_table "workshop_ideas", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.text "age_range"
-    t.text "age_range_spanish"
+    t.text "age_range", size: :medium
+    t.text "age_range_spanish", size: :medium
     t.string "author_credit_preference"
-    t.text "closing"
-    t.text "closing_spanish"
+    t.text "closing", size: :medium
+    t.text "closing_spanish", size: :medium
     t.datetime "created_at", null: false
     t.integer "created_by_id", null: false
-    t.text "creation"
-    t.text "creation_spanish"
-    t.text "demonstration"
-    t.text "demonstration_spanish"
-    t.text "description"
-    t.text "description_spanish"
-    t.text "instructions"
-    t.text "instructions_spanish"
-    t.text "introduction"
-    t.text "introduction_spanish"
-    t.text "materials"
-    t.text "materials_spanish"
-    t.text "misc_instructions_spanish"
-    t.text "notes"
-    t.text "notes_spanish"
-    t.text "objective"
-    t.text "objective_spanish"
-    t.text "opening_circle"
-    t.text "opening_circle_spanish"
-    t.text "optional_materials"
-    t.text "optional_materials_spanish"
-    t.text "setup"
-    t.text "setup_spanish"
-    t.text "staff_notes"
+    t.text "creation", size: :medium
+    t.text "creation_spanish", size: :medium
+    t.text "demonstration", size: :medium
+    t.text "demonstration_spanish", size: :medium
+    t.text "description", size: :medium
+    t.text "description_spanish", size: :medium
+    t.text "instructions", size: :medium
+    t.text "instructions_spanish", size: :medium
+    t.text "introduction", size: :medium
+    t.text "introduction_spanish", size: :medium
+    t.text "materials", size: :medium
+    t.text "materials_spanish", size: :medium
+    t.text "misc_instructions_spanish", size: :medium
+    t.text "notes", size: :medium
+    t.text "notes_spanish", size: :medium
+    t.text "objective", size: :medium
+    t.text "objective_spanish", size: :medium
+    t.text "opening_circle", size: :medium
+    t.text "opening_circle_spanish", size: :medium
+    t.text "optional_materials", size: :medium
+    t.text "optional_materials_spanish", size: :medium
+    t.text "setup", size: :medium
+    t.text "setup_spanish", size: :medium
+    t.text "staff_notes", size: :medium
     t.integer "time_closing"
     t.integer "time_creation"
     t.integer "time_demonstration"
@@ -1116,40 +1126,41 @@
     t.integer "time_opening"
     t.integer "time_opening_circle"
     t.integer "time_warm_up"
-    t.text "timeframe"
-    t.text "timeframe_spanish"
-    t.text "tips"
-    t.text "tips_spanish"
-    t.string "title"
+    t.text "timeframe", size: :medium
+    t.text "timeframe_spanish", size: :medium
+    t.text "tips", size: :medium
+    t.text "tips_spanish", size: :medium
+    t.string "title", null: false
     t.datetime "updated_at", null: false
     t.integer "updated_by_id", null: false
-    t.text "visualization"
-    t.text "visualization_spanish"
-    t.text "warm_up"
-    t.text "warm_up_spanish"
+    t.text "visualization", size: :medium
+    t.text "visualization_spanish", size: :medium
+    t.text "warm_up", size: :medium
+    t.text "warm_up_spanish", size: :medium
     t.integer "windows_type_id", null: false
     t.index ["created_by_id"], name: "index_workshop_ideas_on_created_by_id"
+    t.index ["title"], name: "index_workshop_ideas_on_title", unique: true
     t.index ["updated_by_id"], name: "index_workshop_ideas_on_updated_by_id"
     t.index ["windows_type_id"], name: "index_workshop_ideas_on_windows_type_id"
   end
 
   create_table "workshop_logs", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.text "challenges", size: :medium
-    t.text "comments", size: :medium
+    t.text "challenges", size: :long
+    t.text "comments", size: :long
     t.datetime "created_at", precision: nil, null: false
     t.date "date"
-    t.text "differences", size: :medium
+    t.text "differences", size: :long
     t.boolean "is_embodied_art_workshop", default: false
     t.boolean "lead_similar"
     t.integer "num_participants_first_time", default: 0
     t.integer "num_participants_on_going", default: 0
     t.integer "organization_id"
-    t.text "questions", size: :medium
+    t.text "questions", size: :long
     t.integer "rating", default: 0
-    t.text "reaction", size: :medium
-    t.text "similarities", size: :medium
-    t.text "successes", size: :medium
-    t.text "suggestions", size: :medium
+    t.text "reaction", size: :long
+    t.text "similarities", size: :long
+    t.text "successes", size: :long
+    t.text "suggestions", size: :long
     t.datetime "updated_at", precision: nil, null: false
     t.integer "user_id"
     t.integer "workshop_id"
@@ -1160,9 +1171,9 @@
 
   create_table "workshop_resources", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
-    t.integer "resource_id"
+    t.integer "resource_id", null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.integer "workshop_id"
+    t.integer "workshop_id", null: false
     t.index ["resource_id"], name: "index_workshop_resources_on_resource_id"
     t.index ["workshop_id"], name: "index_workshop_resources_on_workshop_id"
   end
@@ -1181,7 +1192,7 @@
   end
 
   create_table "workshop_variation_ideas", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.string "author_credit_preference"
+    t.string "author_credit_preference", null: false
     t.text "body", size: :long
     t.datetime "created_at", null: false
     t.integer "created_by_id", null: false
@@ -1195,21 +1206,21 @@
     t.string "youtube_url"
     t.index ["body"], name: "index_workshop_variation_ideas_on_body", type: :fulltext
     t.index ["created_by_id"], name: "index_workshop_variation_ideas_on_created_by_id"
-    t.index ["name"], name: "index_workshop_variation_ideas_on_name"
     t.index ["organization_id"], name: "index_workshop_variation_ideas_on_organization_id"
     t.index ["updated_by_id"], name: "index_workshop_variation_ideas_on_updated_by_id"
     t.index ["windows_type_id"], name: "index_workshop_variation_ideas_on_windows_type_id"
+    t.index ["workshop_id", "name"], name: "index_workshop_variation_ideas_on_workshop_id_and_name", unique: true
     t.index ["workshop_id"], name: "index_workshop_variation_ideas_on_workshop_id"
   end
 
   create_table "workshop_variations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "author_credit_preference"
-    t.text "body", size: :medium
+    t.text "body", size: :long
     t.datetime "created_at", precision: nil, null: false
     t.integer "created_by_id"
     t.boolean "inactive", default: true
     t.boolean "legacy", default: false
-    t.string "name"
+    t.string "name", null: false
     t.integer "organization_id"
     t.integer "position"
     t.boolean "publicly_visible", default: false, null: false
@@ -1224,27 +1235,28 @@
     t.index ["organization_id"], name: "index_workshop_variations_on_organization_id"
     t.index ["published"], name: "index_workshop_variations_on_published"
     t.index ["windows_type_id"], name: "index_workshop_variations_on_windows_type_id"
+    t.index ["workshop_id", "name"], name: "index_workshop_variations_on_workshop_id_and_name", unique: true
     t.index ["workshop_id"], name: "index_workshop_variations_on_workshop_id"
     t.index ["workshop_variation_idea_id"], name: "index_workshop_variations_on_workshop_variation_idea_id"
   end
 
   create_table "workshops", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
-    t.text "age_range", size: :medium
-    t.text "age_range_spanish", size: :medium
+    t.text "age_range", size: :long
+    t.text "age_range_spanish", size: :long
     t.string "author_credit_preference"
     t.string "author_location"
-    t.text "closing", size: :medium
-    t.text "closing_spanish", size: :medium
+    t.text "closing", size: :long
+    t.text "closing_spanish", size: :long
     t.datetime "created_at", precision: nil, null: false
     t.integer "created_by_id"
-    t.text "creation", size: :medium
-    t.text "creation_spanish", size: :medium
-    t.text "demonstration", size: :medium
-    t.text "demonstration_spanish", size: :medium
-    t.text "description", size: :medium
-    t.text "description_spanish", size: :medium
-    t.text "extra_field"
-    t.text "extra_field_spanish"
+    t.text "creation", size: :long
+    t.text "creation_spanish", size: :long
+    t.text "demonstration", size: :long
+    t.text "demonstration_spanish", size: :long
+    t.text "description", size: :long
+    t.text "description_spanish", size: :long
+    t.text "extra_field", size: :medium
+    t.text "extra_field_spanish", size: :medium
     t.boolean "featured", default: false
     t.string "filemaker_code"
     t.string "full_name"
@@ -1253,40 +1265,40 @@
     t.integer "header_file_size"
     t.datetime "header_updated_at", precision: nil
     t.boolean "inactive", default: true
-    t.text "instructions", size: :medium
-    t.text "instructions_spanish", size: :medium
-    t.text "introduction", size: :medium
-    t.text "introduction_spanish", size: :medium
+    t.text "instructions", size: :long
+    t.text "instructions_spanish", size: :long
+    t.text "introduction", size: :long
+    t.text "introduction_spanish", size: :long
     t.integer "led_count", default: 0
     t.boolean "legacy", default: false
     t.integer "legacy_id"
-    t.text "materials", size: :medium
-    t.text "materials_spanish", size: :medium
+    t.text "materials", size: :long
+    t.text "materials_spanish", size: :long
     t.string "misc1"
-    t.text "misc1_spanish", size: :medium
+    t.text "misc1_spanish", size: :long
     t.string "misc2"
-    t.text "misc2_spanish", size: :medium
-    t.text "misc_instructions", size: :medium
-    t.text "misc_instructions_spanish", size: :medium
+    t.text "misc2_spanish", size: :long
+    t.text "misc_instructions", size: :long
+    t.text "misc_instructions_spanish", size: :long
     t.integer "month"
-    t.text "notes", size: :medium
-    t.text "notes_spanish", size: :medium
-    t.text "objective", size: :medium
-    t.text "objective_spanish", size: :medium
-    t.text "opening_circle", size: :medium
-    t.text "opening_circle_spanish", size: :medium
-    t.text "optional_materials", size: :medium
-    t.text "optional_materials_spanish", size: :medium
+    t.text "notes", size: :long
+    t.text "notes_spanish", size: :long
+    t.text "objective", size: :long
+    t.text "objective_spanish", size: :long
+    t.text "opening_circle", size: :long
+    t.text "opening_circle_spanish", size: :long
+    t.text "optional_materials", size: :long
+    t.text "optional_materials_spanish", size: :long
     t.string "photo_caption"
-    t.text "project", size: :medium
-    t.text "project_spanish", size: :medium
+    t.text "project", size: :long
+    t.text "project_spanish", size: :long
     t.string "pub_issue"
     t.boolean "publicly_featured", default: false, null: false
     t.boolean "publicly_visible", default: false, null: false
     t.boolean "published", default: false, null: false
     t.boolean "searchable", default: false
-    t.text "setup", size: :medium
-    t.text "setup_spanish", size: :medium
+    t.text "setup", size: :long
+    t.text "setup_spanish", size: :long
     t.string "thumbnail_content_type"
     t.string "thumbnail_file_name"
     t.integer "thumbnail_file_size"
@@ -1298,17 +1310,17 @@
     t.integer "time_opening"
     t.integer "time_opening_circle"
     t.integer "time_warm_up"
-    t.text "timeframe", size: :medium
-    t.text "timeframe_spanish", size: :medium
-    t.text "timestamps", size: :medium
-    t.text "tips", size: :medium
-    t.text "tips_spanish", size: :medium
-    t.string "title"
+    t.text "timeframe", size: :long
+    t.text "timeframe_spanish", size: :long
+    t.text "timestamps", size: :long
+    t.text "tips", size: :long
+    t.text "tips_spanish", size: :long
+    t.string "title", null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.text "visualization", size: :medium
-    t.text "visualization_spanish", size: :medium
-    t.text "warm_up", size: :medium
-    t.text "warm_up_spanish", size: :medium
+    t.text "visualization", size: :long
+    t.text "visualization_spanish", size: :long
+    t.text "warm_up", size: :long
+    t.text "warm_up_spanish", size: :long
     t.integer "windows_type_id"
     t.bigint "workshop_idea_id"
     t.integer "year"
@@ -1326,7 +1338,6 @@
   end
 
   add_foreign_key "action_text_mentions", "action_text_rich_texts"
-  add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "affiliations", "organizations"
   add_foreign_key "affiliations", "organizations", column: "organization_agency_id"
@@ -1362,10 +1373,14 @@
   add_foreign_key "event_registrations", "people", column: "registrant_id"
   add_foreign_key "events", "locations"
   add_foreign_key "events", "users", column: "created_by_id"
+  add_foreign_key "form_answers", "form_fields"
+  add_foreign_key "form_answers", "form_submissions"
   add_foreign_key "form_builders", "windows_types"
   add_foreign_key "form_field_answer_options", "answer_options"
   add_foreign_key "form_field_answer_options", "form_fields"
   add_foreign_key "form_fields", "forms"
+  add_foreign_key "form_submissions", "forms"
+  add_foreign_key "form_submissions", "people"
   add_foreign_key "forms", "form_builders"
   add_foreign_key "monthly_reports", "affiliations", column: "organization_user_id"
   add_foreign_key "monthly_reports", "organizations"
@@ -1377,10 +1392,6 @@
   add_foreign_key "payments", "events"
   add_foreign_key "people", "users", column: "created_by_id"
   add_foreign_key "people", "users", column: "updated_by_id"
-  add_foreign_key "person_form_form_fields", "form_fields"
-  add_foreign_key "person_form_form_fields", "person_forms"
-  add_foreign_key "person_forms", "forms"
-  add_foreign_key "person_forms", "people"
   add_foreign_key "quotable_item_quotes", "quotes"
   add_foreign_key "quotes", "workshops"
   add_foreign_key "report_form_field_answers", "answer_options"
diff --git a/db/seeds.rb b/db/seeds.rb
index eeb12772e..ccd14c0e9 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -470,16 +470,3 @@ def find_or_create_by_name!(klass, name, **attrs, &block)
   end
   cat.update!(published: true) unless cat.published?
 end
-
-puts "Creating standalone registration forms…"
-unless Form.standalone.exists?(name: ShortEventRegistrationFormBuilder::FORM_NAME)
-  ShortEventRegistrationFormBuilder.build_standalone!
-end
-
-unless Form.standalone.exists?(name: ExtendedEventRegistrationFormBuilder::FORM_NAME)
-  ExtendedEventRegistrationFormBuilder.build_standalone!
-end
-
-unless Form.standalone.exists?(name: ScholarshipApplicationFormBuilder::FORM_NAME)
-  ScholarshipApplicationFormBuilder.build_standalone!
-end
diff --git a/db/seeds/dummy_dev_seeds.rb b/db/seeds/dummy_dev_seeds.rb
index e9c9c3445..8e35b9402 100644
--- a/db/seeds/dummy_dev_seeds.rb
+++ b/db/seeds/dummy_dev_seeds.rb
@@ -917,11 +917,34 @@
 end
 
 
+puts "Creating standalone registration forms…"
+unless Form.standalone.exists?(name: "Short Event Registration")
+  FormBuilderService.new(
+    name: "Short Event Registration",
+    sections: %i[person_identifier consent marketing scholarship]
+  ).call
+end
+
+unless Form.standalone.exists?(name: "Extended Event Registration")
+  FormBuilderService.new(
+    name: "Extended Event Registration",
+    sections: %i[person_identifier person_contact_info person_background professional_info marketing scholarship payment consent]
+  ).call
+end
+
+unless Form.standalone.scholarship_application.exists?
+  FormBuilderService.new(
+    name: "Scholarship Application",
+    sections: %i[scholarship],
+    scholarship_application: true
+  ).call
+end
+
 puts "Creating Events with shared forms…"
 admin_user = User.find_by(email: "umberto.user@example.com")
-long_form = Form.standalone.find_by!(name: ExtendedEventRegistrationFormBuilder::FORM_NAME)
-short_form = Form.standalone.find_by!(name: ShortEventRegistrationFormBuilder::FORM_NAME)
-scholarship_form = Form.standalone.find_by!(name: ScholarshipApplicationFormBuilder::FORM_NAME)
+long_form = Form.standalone.find_by!(name: "Extended Event Registration")
+short_form = Form.standalone.find_by!(name: "Short Event Registration")
+scholarship_form = Form.standalone.scholarship_application.first!
 
 # Each entry: [title, form_type, cost_cents, scholarship?, visibility]
 # form_type: :long, :short, or :none
@@ -1117,7 +1140,7 @@
 end
 
 puts "Creating Registration Form Submissions…"
-# Create person_form records linking registrants to their event's registration form.
+# Create form_submission records linking registrants to their event's registration form.
 # This simulates people who filled out the registration form.
 form_submissions = []
 
@@ -1198,13 +1221,13 @@
 # Create all form submissions with sample field responses
 form_submissions.each do |data|
   next unless data[:person] && data[:form]
-  next if PersonForm.exists?(person: data[:person], form: data[:form])
+  next if FormSubmission.exists?(person: data[:person], form: data[:form])
 
-  pf = PersonForm.create!(person: data[:person], form: data[:form])
+  pf = FormSubmission.create!(person: data[:person], form: data[:form])
 
   # Fill in required text fields with sample data
   data[:form].form_fields.where(answer_type: [ :free_form_input_one_line, :free_form_input_paragraph ]).each do |field|
-    sample_text = case field.field_key
+    sample_text = case field.field_identifier
     when "first_name" then data[:person].first_name
     when "last_name" then data[:person].last_name
     when "primary_email", "enter_email", "confirm_email" then data[:person].preferred_email || "sample@example.com"
@@ -1228,10 +1251,11 @@
       end
     end
 
-    PersonFormFormField.create!(
-      person_form: pf,
+    FormAnswer.create!(
+      form_submission: pf,
       form_field: field,
-      text: sample_text.to_s
+      submitted_answer: sample_text.to_s,
+      question_name_when_answered: field.name
     )
   end
 end
diff --git a/spec/factories/form_answers.rb b/spec/factories/form_answers.rb
new file mode 100644
index 000000000..1a54b12ca
--- /dev/null
+++ b/spec/factories/form_answers.rb
@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :form_answer do
+    association :form_submission
+    association :form_field
+    submitted_answer { Faker::Lorem.sentence }
+    question_name_when_answered { nil }
+  end
+end
diff --git a/spec/factories/form_fields.rb b/spec/factories/form_fields.rb
index 0c434bd43..4bb24e6f3 100644
--- a/spec/factories/form_fields.rb
+++ b/spec/factories/form_fields.rb
@@ -3,10 +3,10 @@
     # Association: belongs_to :form
     association :form
 
-    question { Faker::Lorem.sentence }
+    name { Faker::Lorem.sentence }
     status { :active } # Default to active
     answer_type { :free_form_input_one_line } # Default type
-    answer_datatype { :text_alphanumeric } # Default datatype
+    input_type { :text_alphanumeric } # Default datatype
     sequence(:position) { |n| n }
     parent_id { nil }
 
diff --git a/spec/factories/person_forms.rb b/spec/factories/form_submissions.rb
similarity index 71%
rename from spec/factories/person_forms.rb
rename to spec/factories/form_submissions.rb
index 39a87691b..1de1bcde8 100644
--- a/spec/factories/person_forms.rb
+++ b/spec/factories/form_submissions.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :person_form do
+  factory :form_submission do
     association :person
     association :form
   end
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 2ee7e5651..f81b85562 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -121,8 +121,8 @@
   end
 
   describe "#build_public_registration_form" do
-    let!(:default_form) { create(:form, name: ShortEventRegistrationFormBuilder::FORM_NAME) }
-    let!(:extended_form) { create(:form, name: ExtendedEventRegistrationFormBuilder::FORM_NAME) }
+    let!(:default_form) { create(:form, name: "Short Event Registration") }
+    let!(:extended_form) { create(:form, name: "Extended Event Registration") }
 
     it "links the default registration form by default" do
       event = create(:event, public_registration_enabled: true)
diff --git a/spec/models/form_answer_spec.rb b/spec/models/form_answer_spec.rb
new file mode 100644
index 000000000..cc2b36ef6
--- /dev/null
+++ b/spec/models/form_answer_spec.rb
@@ -0,0 +1,44 @@
+require "rails_helper"
+
+RSpec.describe FormAnswer do
+  describe "associations" do
+    it { should belong_to(:form_field).optional }
+    it { should belong_to(:form_submission) }
+  end
+
+  describe "#name" do
+    let(:form) { create(:form) }
+    let(:form_field) { create(:form_field, form: form, name: "First Name") }
+    let(:submission) { create(:form_submission, form: form) }
+
+    it "uses question_name_when_answered when present" do
+      answer = create(:form_answer,
+        form_submission: submission,
+        form_field: form_field,
+        submitted_answer: "Alice",
+        question_name_when_answered: "Original Question")
+
+      expect(answer.name).to eq("Original Question: Alice")
+    end
+
+    it "falls back to form_field.name when question_name_when_answered is blank" do
+      answer = create(:form_answer,
+        form_submission: submission,
+        form_field: form_field,
+        submitted_answer: "Alice",
+        question_name_when_answered: nil)
+
+      expect(answer.name).to eq("First Name: Alice")
+    end
+
+    it "handles deleted form_field gracefully" do
+      answer = create(:form_answer,
+        form_submission: submission,
+        form_field: nil,
+        submitted_answer: "Alice",
+        question_name_when_answered: "Deleted Question")
+
+      expect(answer.name).to eq("Deleted Question: Alice")
+    end
+  end
+end
diff --git a/spec/models/form_field_spec.rb b/spec/models/form_field_spec.rb
index fa1b0ce6a..90243fb5b 100644
--- a/spec/models/form_field_spec.rb
+++ b/spec/models/form_field_spec.rb
@@ -20,22 +20,95 @@
     subject do
       build(:form_field, form: create(:form))
     end
-    it { should validate_presence_of(:question) }
+    it { should validate_presence_of(:name) }
   end
 
   describe 'enums' do
     it { should define_enum_for(:status).with_values([ :inactive, :active ]) }
     it { should define_enum_for(:answer_type).with_values([ :free_form_input_one_line, :free_form_input_paragraph,
-                                                            :multiple_choice_radio, :no_user_input, :multiple_choice_checkbox,
-                                                            :group_header ]) }
-    it { should define_enum_for(:answer_datatype).with_values([ :text_alphanumeric, :number_integer, :number_decimal, :date ]) }
+                                                           :multiple_choice_radio, :no_user_input, :multiple_choice_checkbox,
+                                                           :group_header ]) }
+    it { should define_enum_for(:input_type).with_values([ :text_alphanumeric, :number_integer, :number_decimal, :date ]) }
   end
 
-  # it 'is valid with valid attributes' do
-  #   # Note: Factory needs form association uncommented for create
-  #   # expect(build(:form_field)).to be_valid
-  #   pending("Requires functional form factory and association uncommented")
-  # end
+  describe "enums" do
+    it { should define_enum_for(:visibility).with_values([ :always_ask, :scholarship_only, :logged_out_only, :answers_on_file ]) }
+  end
+
+  describe "#multiple_choice?" do
+    let(:form) { create(:form) }
+
+    it "returns true for checkbox fields" do
+      field = build(:form_field, form: form, answer_type: :multiple_choice_checkbox)
+      expect(field.multiple_choice?).to be true
+    end
+
+    it "returns true for radio fields" do
+      field = build(:form_field, form: form, answer_type: :multiple_choice_radio)
+      expect(field.multiple_choice?).to be true
+    end
+
+    it "returns false for text fields" do
+      field = build(:form_field, form: form, answer_type: :free_form_input_one_line)
+      expect(field.multiple_choice?).to be false
+    end
+  end
+
+  describe "#html_input_type" do
+    let(:form) { create(:form) }
+
+    it "returns :text for one-line inputs" do
+      field = build(:form_field, form: form, answer_type: :free_form_input_one_line)
+      expect(field.html_input_type).to eq(:text)
+    end
+
+    it "returns :textarea for paragraphs" do
+      field = build(:form_field, form: form, answer_type: :free_form_input_paragraph)
+      expect(field.html_input_type).to eq(:textarea)
+    end
+
+    it "returns :checkbox for checkbox fields" do
+      field = build(:form_field, form: form, answer_type: :multiple_choice_checkbox)
+      expect(field.html_input_type).to eq(:checkbox)
+    end
 
-  # Add tests for methods like #name, #multiple_choice?, #html_id, etc.
+    it "returns :radio for radio fields" do
+      field = build(:form_field, form: form, answer_type: :multiple_choice_radio)
+      expect(field.html_input_type).to eq(:radio)
+    end
+
+    it "returns :label for no_user_input without children" do
+      field = build(:form_field, form: form, answer_type: :no_user_input)
+      expect(field.html_input_type).to eq(:label)
+    end
+
+    it "returns :label for group_header without children" do
+      field = build(:form_field, form: form, answer_type: :group_header)
+      expect(field.html_input_type).to eq(:label)
+    end
+  end
+
+  describe "#form_helper_type" do
+    let(:form) { create(:form) }
+
+    it "returns :text_field for one-line inputs" do
+      field = build(:form_field, form: form, answer_type: :free_form_input_one_line)
+      expect(field.form_helper_type).to eq(:text_field)
+    end
+
+    it "returns :text_area for paragraphs" do
+      field = build(:form_field, form: form, answer_type: :free_form_input_paragraph)
+      expect(field.form_helper_type).to eq(:text_area)
+    end
+
+    it "returns :check_box for checkbox fields" do
+      field = build(:form_field, form: form, answer_type: :multiple_choice_checkbox)
+      expect(field.form_helper_type).to eq(:check_box)
+    end
+
+    it "returns :radio_button for radio fields" do
+      field = build(:form_field, form: form, answer_type: :multiple_choice_radio)
+      expect(field.form_helper_type).to eq(:radio_button)
+    end
+  end
 end
diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb
index caf28db09..a9a68e7ab 100644
--- a/spec/models/form_spec.rb
+++ b/spec/models/form_spec.rb
@@ -9,6 +9,7 @@
     it { should have_many(:events).through(:event_forms) }
     it { should have_many(:form_fields).dependent(:destroy).inverse_of(:form) }
     it { should have_many(:user_forms) }
+    it { should have_many(:form_submissions) }
     it { should have_many(:reports) } # As :owner
 
     it { should accept_nested_attributes_for(:form_fields).allow_destroy(true) }
diff --git a/spec/models/form_submission_spec.rb b/spec/models/form_submission_spec.rb
new file mode 100644
index 000000000..74b40c839
--- /dev/null
+++ b/spec/models/form_submission_spec.rb
@@ -0,0 +1,10 @@
+require "rails_helper"
+
+RSpec.describe FormSubmission do
+  describe "associations" do
+    it { should belong_to(:person) }
+    it { should belong_to(:form) }
+    it { should have_many(:form_answers).dependent(:destroy) }
+    it { should accept_nested_attributes_for(:form_answers) }
+  end
+end
diff --git a/spec/requests/event_registrations_spec.rb b/spec/requests/event_registrations_spec.rb
index da600744f..cbadfb5cf 100644
--- a/spec/requests/event_registrations_spec.rb
+++ b/spec/requests/event_registrations_spec.rb
@@ -55,7 +55,7 @@
 
         it "shows green icon when person submitted the current registration form" do
           create(:event_form, event: event, form: reg_form, role: "registration")
-          create(:person_form, person: person, form: reg_form)
+          create(:form_submission, person: person, form: reg_form)
 
           get event_registrations_path
 
@@ -74,7 +74,7 @@
           scholarship_form = create(:form, :standalone, name: "Scholarship Form")
           create(:event_form, event: event, form: reg_form, role: "registration")
           create(:event_form, event: event, form: scholarship_form, role: "scholarship")
-          create(:person_form, person: person, form: scholarship_form)
+          create(:form_submission, person: person, form: scholarship_form)
 
           get event_registrations_path
 
diff --git a/spec/requests/events/registrations_spec.rb b/spec/requests/events/registrations_spec.rb
index ddd82c312..8c1ffbf5c 100644
--- a/spec/requests/events/registrations_spec.rb
+++ b/spec/requests/events/registrations_spec.rb
@@ -151,9 +151,13 @@
     let!(:registration) { create(:event_registration, event: event, registrant: user.person) }
 
     before do
-      ExtendedEventRegistrationFormBuilder.build!(event)
+      form = FormBuilderService.new(
+        name: "Extended Event Registration",
+        sections: %i[person_identifier person_contact_info person_background professional_info marketing scholarship payment consent]
+      ).call
+      EventForm.create!(event: event, form: form, role: "registration")
       form = event.registration_form
-      form.person_forms.create!(person: user.person)
+      form.form_submissions.create!(person: user.person)
     end
 
     it "allows access with a valid slug" do
diff --git a/spec/requests/events_spec.rb b/spec/requests/events_spec.rb
index cbd79016a..88cde4453 100644
--- a/spec/requests/events_spec.rb
+++ b/spec/requests/events_spec.rb
@@ -339,7 +339,7 @@
 
       it "shows green icon when person submitted the current registration form" do
         create(:event_form, event: event, form: reg_form, role: "registration")
-        create(:person_form, person: person, form: reg_form)
+        create(:form_submission, person: person, form: reg_form)
 
         get manage_event_path(event)
 
@@ -360,7 +360,7 @@
         scholarship_form = create(:form, :standalone, name: "Scholarship Form")
         create(:event_form, event: event, form: reg_form, role: "registration")
         create(:event_form, event: event, form: scholarship_form, role: "scholarship")
-        create(:person_form, person: person, form: scholarship_form)
+        create(:form_submission, person: person, form: scholarship_form)
 
         get manage_event_path(event)
 
diff --git a/spec/requests/forms_spec.rb b/spec/requests/forms_spec.rb
new file mode 100644
index 000000000..2c9fe9bdf
--- /dev/null
+++ b/spec/requests/forms_spec.rb
@@ -0,0 +1,186 @@
+require "rails_helper"
+
+RSpec.describe "Forms", type: :request do
+  let(:admin) { create(:user, super_user: true) }
+  let(:user) { create(:user) }
+
+  describe "GET /forms" do
+    context "as admin" do
+      before { sign_in admin }
+
+      it "lists standalone forms" do
+        create(:form, :standalone, name: "My Form")
+        get forms_path
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include("My Form")
+      end
+    end
+
+    context "as regular user" do
+      before { sign_in user }
+
+      it "denies access" do
+        get forms_path
+        expect(response).to redirect_to(root_path)
+      end
+    end
+  end
+
+  describe "GET /forms/new" do
+    before { sign_in admin }
+
+    it "shows section checkboxes" do
+      get new_form_path
+      expect(response).to have_http_status(:success)
+      expect(response.body).to include("Person identifier")
+      expect(response.body).to include("Scholarship")
+    end
+  end
+
+  describe "POST /forms" do
+    before { sign_in admin }
+
+    it "creates a form with selected sections" do
+      post forms_path, params: {
+        name: "Custom Form",
+        sections: %w[person_identifier consent]
+      }
+      form = Form.last
+      expect(form.name).to eq("Custom Form")
+      expect(form.sections).to eq(%w[person_identifier consent])
+      expect(response).to redirect_to(edit_form_path(form))
+    end
+
+    it "rejects when no sections selected" do
+      post forms_path, params: { name: "Empty", sections: [] }
+      expect(response).to have_http_status(:unprocessable_content)
+    end
+  end
+
+  describe "GET /forms/:id/edit" do
+    before { sign_in admin }
+
+    it "shows form field editor" do
+      form = FormBuilderService.new(name: "Test", sections: %i[person_identifier]).call
+      get edit_form_path(form)
+      expect(response).to have_http_status(:success)
+      expect(response.body).to include("First Name")
+    end
+  end
+
+  describe "PATCH /forms/:id" do
+    before { sign_in admin }
+
+    it "updates form name" do
+      form = create(:form, :standalone, name: "Old Name")
+      patch form_path(form), params: { form: { name: "New Name" } }
+      expect(form.reload.name).to eq("New Name")
+      expect(response).to redirect_to(edit_form_path(form))
+    end
+
+    it "updates hide_answered flags" do
+      form = create(:form, :standalone)
+      patch form_path(form), params: {
+        form: { hide_answered_person_questions: true, hide_answered_form_questions: true }
+      }
+      form.reload
+      expect(form.hide_answered_person_questions).to be true
+      expect(form.hide_answered_form_questions).to be true
+    end
+  end
+
+  describe "DELETE /forms/:id" do
+    before { sign_in admin }
+
+    it "destroys the form" do
+      form = create(:form, :standalone, name: "Doomed")
+      expect { delete form_path(form) }.to change(Form, :count).by(-1)
+      expect(response).to redirect_to(forms_path)
+    end
+  end
+
+  describe "GET /forms/:id" do
+    before { sign_in admin }
+
+    it "shows form preview" do
+      form = FormBuilderService.new(name: "Preview", sections: %i[person_identifier]).call
+      get form_path(form)
+      expect(response).to have_http_status(:success)
+      expect(response.body).to include("First Name")
+    end
+
+    it "filters scholarship-only fields when toggle is off" do
+      form = FormBuilderService.new(name: "Full", sections: %i[person_identifier scholarship]).call
+      get form_path(form)
+      expect(response.body).not_to include("Scholarship Application")
+    end
+
+    it "shows scholarship fields when toggle is on" do
+      form = FormBuilderService.new(name: "Full", sections: %i[person_identifier scholarship]).call
+      get form_path(form, preview_scholarship: "1")
+      expect(response.body).to include("Scholarship Application")
+    end
+  end
+
+  describe "GET /forms/:id/edit_sections" do
+    before { sign_in admin }
+
+    it "shows section checkboxes for existing form" do
+      form = FormBuilderService.new(name: "Editable", sections: %i[person_identifier]).call
+      get edit_sections_form_path(form)
+      expect(response).to have_http_status(:success)
+      expect(response.body).to include("Person identifier")
+    end
+  end
+
+  describe "PATCH /forms/:id/update_sections" do
+    before { sign_in admin }
+
+    it "adds new sections to existing form" do
+      form = FormBuilderService.new(name: "Growing", sections: %i[person_identifier]).call
+      initial_count = form.form_fields.count
+
+      patch update_sections_form_path(form), params: {
+        sections: %w[person_identifier consent]
+      }
+
+      form.reload
+      expect(form.sections).to include("consent")
+      expect(form.form_fields.count).to be > initial_count
+      expect(response).to redirect_to(edit_form_path(form))
+    end
+
+    it "removes sections from existing form" do
+      form = FormBuilderService.new(name: "Shrinking", sections: %i[person_identifier consent]).call
+      patch update_sections_form_path(form), params: {
+        sections: %w[person_identifier]
+      }
+
+      form.reload
+      expect(form.sections).not_to include("consent")
+      expect(form.form_fields.where(section: "consent")).to be_empty
+    end
+
+    it "rejects empty sections" do
+      form = FormBuilderService.new(name: "Protected", sections: %i[person_identifier]).call
+      patch update_sections_form_path(form), params: { sections: [] }
+      expect(response).to have_http_status(:unprocessable_content)
+    end
+  end
+
+  describe "PUT /forms/:id/reorder_fields" do
+    before { sign_in admin }
+
+    it "reorders fields" do
+      form = FormBuilderService.new(name: "Reorder", sections: %i[person_identifier]).call
+      fields = form.form_fields.reorder(position: :asc)
+      new_positions = fields.map.with_index { |f, i| { id: f.id, position: fields.size - i } }
+
+      put reorder_fields_form_path(form),
+        params: { positions: new_positions }.to_json,
+        headers: { "Content-Type" => "application/json" }
+
+      expect(response).to have_http_status(:ok)
+    end
+  end
+end
diff --git a/spec/services/event_registration_services/public_registration_spec.rb b/spec/services/event_registration_services/public_registration_spec.rb
index 9db68e2d3..2e6bee7c5 100644
--- a/spec/services/event_registration_services/public_registration_spec.rb
+++ b/spec/services/event_registration_services/public_registration_spec.rb
@@ -2,10 +2,17 @@
 
 RSpec.describe EventRegistrationServices::PublicRegistration do
   let(:event) { create(:event, :published, :publicly_visible) }
-  let(:form) { ExtendedEventRegistrationFormBuilder.build!(event) }
+  let(:form) do
+    f = FormBuilderService.new(
+      name: "Extended Event Registration",
+      sections: %i[person_identifier person_contact_info person_background professional_info marketing scholarship payment consent]
+    ).call
+    event.event_forms.create!(form: f, role: "registration")
+    f
+  end
 
   def field_id(key)
-    form.form_fields.find_by!(field_key: key).id.to_s
+    form.form_fields.find_by!(field_identifier: key).id.to_s
   end
 
   def base_form_params(first_name:, last_name:, email:)
diff --git a/spec/services/form_builder_service_spec.rb b/spec/services/form_builder_service_spec.rb
new file mode 100644
index 000000000..320f2d262
--- /dev/null
+++ b/spec/services/form_builder_service_spec.rb
@@ -0,0 +1,181 @@
+require "rails_helper"
+
+RSpec.describe FormBuilderService do
+  describe "#call" do
+    it "creates a form with the given name" do
+      form = described_class.new(name: "Test Form", sections: %i[person_identifier]).call
+      expect(form.name).to eq("Test Form")
+    end
+
+    it "stores selected sections on the form" do
+      form = described_class.new(name: "Test", sections: %i[person_identifier consent]).call
+      expect(form.sections).to eq(%w[person_identifier consent])
+    end
+
+    it "sets scholarship_application flag" do
+      form = described_class.new(name: "Scholarship", sections: %i[scholarship], scholarship_application: true).call
+      expect(form.scholarship_application).to be true
+    end
+
+    it "creates fields with sequential positions" do
+      form = described_class.new(name: "Test", sections: %i[person_identifier consent]).call
+      positions = form.form_fields.unscoped.where(form: form).order(:position).pluck(:position)
+      expect(positions).to eq((1..positions.size).to_a)
+    end
+
+    context "person_identifier section" do
+      let(:form) { described_class.new(name: "Test", sections: %i[person_identifier]).call }
+
+      it "creates first_name, last_name, primary_email, and confirm_email fields" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).to include("first_name", "last_name", "primary_email", "confirm_email")
+      end
+    end
+
+    context "person_contact_info section" do
+      let(:form) { described_class.new(name: "Test", sections: %i[person_contact_info]).call }
+
+      it "creates contact info fields" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).to include("nickname", "pronouns", "phone", "mailing_city", "agency_name")
+      end
+    end
+
+    context "scholarship section" do
+      let(:form) { described_class.new(name: "Test", sections: %i[scholarship]).call }
+
+      it "creates scholarship fields" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).to include("scholarship_eligibility", "impact_description", "implementation_plan")
+      end
+    end
+
+    context "consent section" do
+      let(:form) { described_class.new(name: "Test", sections: %i[consent]).call }
+
+      it "creates communication_consent field" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).to include("communication_consent")
+      end
+    end
+
+    context "payment section" do
+      let(:form) { described_class.new(name: "Test", sections: %i[payment]).call }
+
+      it "creates payment fields" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).to include("number_of_attendees", "payment_method")
+      end
+    end
+
+    context "marketing section" do
+      let(:form) { described_class.new(name: "Test", sections: %i[marketing]).call }
+
+      it "creates marketing fields" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).to include("referral_source", "training_motivation", "interested_in_more")
+      end
+    end
+
+    context "post_event_feedback section" do
+      let(:form) { described_class.new(name: "Test", sections: %i[post_event_feedback]).call }
+
+      it "creates post-event feedback fields" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).to include("event_rating", "most_valuable", "improvement_suggestions")
+      end
+    end
+
+    context "with multiple sections (short event registration)" do
+      let(:form) do
+        described_class.new(
+          name: "Short Event Registration",
+          sections: %i[person_identifier consent marketing scholarship]
+        ).call
+      end
+
+      it "creates fields from all selected sections" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).to include("first_name", "communication_consent", "referral_source", "scholarship_eligibility")
+      end
+
+      it "does not include fields from unselected sections" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).not_to include("nickname", "phone", "payment_method")
+      end
+    end
+
+    context "with multiple sections (extended event registration)" do
+      let(:form) do
+        described_class.new(
+          name: "Extended Event Registration",
+          sections: %i[person_identifier person_contact_info person_background professional_info marketing scholarship payment consent]
+        ).call
+      end
+
+      it "creates fields from all sections" do
+        keys = form.form_fields.pluck(:field_identifier).compact
+        expect(keys).to include(
+          "first_name", "nickname", "racial_ethnic_identity",
+          "primary_service_area", "referral_source",
+          "scholarship_eligibility", "payment_method", "communication_consent"
+        )
+      end
+    end
+  end
+
+  describe ".update_sections!" do
+    it "adds new sections and their fields" do
+      form = described_class.new(name: "Test", sections: %i[person_identifier]).call
+      initial_count = form.form_fields.count
+
+      described_class.update_sections!(form, %i[person_identifier consent])
+
+      form.reload
+      expect(form.sections).to eq(%w[person_identifier consent])
+      expect(form.form_fields.count).to be > initial_count
+      expect(form.form_fields.pluck(:field_identifier).compact).to include("communication_consent")
+    end
+
+    it "removes unchecked sections and their fields" do
+      form = described_class.new(name: "Test", sections: %i[person_identifier consent]).call
+      expect(form.form_fields.where(section: "consent").count).to be > 0
+
+      described_class.update_sections!(form, %i[person_identifier])
+
+      form.reload
+      expect(form.sections).to eq(%w[person_identifier])
+      expect(form.form_fields.where(section: "consent")).to be_empty
+    end
+
+    it "removes section headers when a section is removed" do
+      form = described_class.new(name: "Test", sections: %i[person_identifier scholarship]).call
+      expect(form.form_fields.where(answer_type: :group_header, name: "Scholarship Application")).to exist
+
+      described_class.update_sections!(form, %i[person_identifier])
+
+      form.reload
+      expect(form.form_fields.where(answer_type: :group_header, name: "Scholarship Application")).not_to exist
+    end
+
+    it "preserves existing fields when sections are unchanged" do
+      form = described_class.new(name: "Test", sections: %i[person_identifier consent]).call
+      original_ids = form.form_fields.pluck(:id).sort
+
+      described_class.update_sections!(form, %i[person_identifier consent])
+
+      form.reload
+      expect(form.form_fields.pluck(:id).sort).to eq(original_ids)
+    end
+
+    it "appends new fields after existing ones" do
+      form = described_class.new(name: "Test", sections: %i[person_identifier]).call
+      max_before = form.form_fields.maximum(:position)
+
+      described_class.update_sections!(form, %i[person_identifier consent])
+
+      new_fields = form.form_fields.where(section: "consent")
+      expect(new_fields.minimum(:position)).to be > max_before
+    end
+  end
+end
diff --git a/spec/services/scholarship_application_form_builder_spec.rb b/spec/services/scholarship_application_form_builder_spec.rb
deleted file mode 100644
index b12998948..000000000
--- a/spec/services/scholarship_application_form_builder_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require "rails_helper"
-
-RSpec.describe ScholarshipApplicationFormBuilder do
-  let(:event) { create(:event) }
-
-  describe ".build!" do
-    subject(:form) { described_class.build!(event) }
-
-    it "creates a standalone scholarship form linked to the event" do
-      expect(form.name).to eq("Scholarship Application")
-      expect(form.scholarship_application).to be true
-      expect(event.scholarship_form).to eq(form)
-    end
-
-    it "creates all expected form fields" do
-      expect(form.form_fields.count).to eq(5)
-    end
-
-    it "assigns sequential positions starting at 1" do
-      positions = form.form_fields.unscoped.where(form: form).order(:position).pluck(:position)
-      expect(positions).to eq((1..5).to_a)
-    end
-
-    it "creates a Scholarship Application header" do
-      headers = form.form_fields.where(answer_type: :group_header).pluck(:question)
-      expect(headers).to contain_exactly("Scholarship Application")
-    end
-
-    it "creates scholarship eligibility as a required checkbox" do
-      field = form.form_fields.find_by(field_key: "scholarship_eligibility")
-
-      expect(field.answer_type).to eq("multiple_choice_checkbox")
-      expect(field.is_required).to be true
-      expect(field.form_field_answer_options.count).to eq(1)
-    end
-
-    it "creates required paragraph fields for impact and implementation" do
-      impact = form.form_fields.find_by(field_key: "impact_description")
-      implementation = form.form_fields.find_by(field_key: "implementation_plan")
-
-      expect(impact.answer_type).to eq("free_form_input_paragraph")
-      expect(impact.is_required).to be true
-      expect(implementation.answer_type).to eq("free_form_input_paragraph")
-      expect(implementation.is_required).to be true
-    end
-
-    it "creates an optional additional comments field" do
-      field = form.form_fields.find_by(field_key: "additional_comments")
-
-      expect(field.answer_type).to eq("free_form_input_paragraph")
-      expect(field.is_required).to be false
-    end
-
-    it "assigns all fields to the scholarship group" do
-      groups = form.form_fields.pluck(:field_group).uniq
-      expect(groups).to eq([ "scholarship" ])
-    end
-  end
-
-  describe ".build_standalone!" do
-    it "creates a form without linking to an event" do
-      form = described_class.build_standalone!
-
-      expect(form.name).to eq("Scholarship Application")
-      expect(form.scholarship_application).to be true
-      expect(form.event_forms).to be_empty
-    end
-  end
-end
diff --git a/spec/system/event_registration_show_spec.rb b/spec/system/event_registration_show_spec.rb
index 0acfa50b9..e30d5aada 100644
--- a/spec/system/event_registration_show_spec.rb
+++ b/spec/system/event_registration_show_spec.rb
@@ -50,9 +50,12 @@
 
   describe "view registration form link" do
     it "links to form show with slug param" do
-      ExtendedEventRegistrationFormBuilder.build!(event)
+      FormBuilderService.new(
+        name: "Extended Event Registration",
+        sections: %i[person_identifier person_contact_info person_background professional_info marketing scholarship payment consent]
+      ).call.tap { |form| EventForm.create!(event: event, form: form, role: "registration") }
       form = event.registration_form
-      form.person_forms.create!(person: user.person)
+      form.form_submissions.create!(person: user.person)
 
       sign_in(user)
       visit registration_ticket_path(registration.slug)
diff --git a/spec/system/events_show_spec.rb b/spec/system/events_show_spec.rb
index 7aafe915b..fa65978cf 100644
--- a/spec/system/events_show_spec.rb
+++ b/spec/system/events_show_spec.rb
@@ -43,7 +43,7 @@
 
     context "when event has a public registration form" do
       before do
-        create(:form, name: ShortEventRegistrationFormBuilder::FORM_NAME)
+        create(:form, name: "Short Event Registration")
         event.update!(public_registration_enabled: true)
       end
 
diff --git a/spec/system/public_registration_new_spec.rb b/spec/system/public_registration_new_spec.rb
index e5feef547..a14270938 100644
--- a/spec/system/public_registration_new_spec.rb
+++ b/spec/system/public_registration_new_spec.rb
@@ -14,7 +14,11 @@
 
   before do
     driven_by(:rack_test)
-    ExtendedEventRegistrationFormBuilder.build!(event)
+    form = FormBuilderService.new(
+      name: "Extended Event Registration",
+      sections: %i[person_identifier person_contact_info person_background professional_info marketing scholarship payment consent]
+    ).call
+    EventForm.create!(event: event, form: form, role: "registration")
   end
 
   describe "back to event link" do