diff --git a/src/renderer/src/stories/JSONSchemaForm.js b/src/renderer/src/stories/JSONSchemaForm.js
index c73e04526..c17ae04ac 100644
--- a/src/renderer/src/stories/JSONSchemaForm.js
+++ b/src/renderer/src/stories/JSONSchemaForm.js
@@ -40,10 +40,6 @@ const componentCSS = `
       line-height: 1.4285em;
     }
 
-    .invalid {
-      background: rgb(255, 229, 228) !important;
-    }
-
     .guided--form-label {
       display: block;
       width: 100%;
@@ -320,11 +316,11 @@ export class JSONSchemaForm extends LitElement {
 
     validate = async (resolved) => {
         // Check if any required inputs are missing
-        const invalidInputs = await this.#validateRequirements(resolved); // get missing required paths
-        const isValid = this.requirementMode === "loose" ? true : !invalidInputs.length;
+        const requiredButNotSpecified = await this.#validateRequirements(resolved); // get missing required paths
+        const isValid = this.requirementMode === "loose" ? true : !requiredButNotSpecified.length;
 
         // Print out a detailed error message if any inputs are missing
-        let message = isValid ? "" : `${invalidInputs.length} required inputs are not specified properly.`;
+        let message = isValid ? "" : `${requiredButNotSpecified.length} required inputs are not specified properly.`;
 
         // Check if all inputs are valid
         const flaggedInputs = this.shadowRoot ? this.shadowRoot.querySelectorAll(".invalid") : [];
@@ -376,11 +372,7 @@ export class JSONSchemaForm extends LitElement {
     #checkRequiredAfterChange = async (localPath) => {
         const path = [...localPath];
         const name = path.pop();
-        const element = this.shadowRoot
-            .querySelector(`#${localPath.join("-")}`)
-            .querySelector("jsonschema-input")
-            .getElement();
-        const isValid = await this.triggerValidation(name, element, path, false);
+        const isValid = await this.triggerValidation(name, path, false);
         if (!isValid) return true;
     };
 
@@ -603,7 +595,7 @@ export class JSONSchemaForm extends LitElement {
     };
 
     // Assume this is going to return as a Promise—even if the change function isn't returning one
-    triggerValidation = async (name, element, path = [], checkLinks = true) => {
+    triggerValidation = async (name, path = [], checkLinks = true) => {
         const parent = this.#get(path, this.resolved);
 
         const pathToValidate = [...(this.base ?? []), ...path];
@@ -644,12 +636,15 @@ export class JSONSchemaForm extends LitElement {
         } else {
             // For non-links, throw a basic requirement error if the property is required
             if (!errors.length && isRequired && !parent[name]) {
-                const schema = this.getSchema(localPath);
-                errors.push({
-                    message: `${schema.title ?? header(name)} is a required property.`,
-                    type: "error",
-                    missing: true,
-                }); // Throw at least a basic error if the property is required
+                // Skip simple required checks in loose mode
+                if (this.requirementMode !== "loose") {
+                    const schema = this.getSchema(localPath);
+                    errors.push({
+                        message: `${schema.title ?? header(name)} is a required property.`,
+                        type: "error",
+                        missing: true,
+                    }); // Throw at least a basic error if the property is required
+                }
             }
         }
 
@@ -676,8 +671,10 @@ export class JSONSchemaForm extends LitElement {
         warnings.forEach((info) => this.#addMessage(localPath, info, "warnings"));
         info.forEach((info) => this.#addMessage(localPath, info, "info"));
 
+        const input = this.getInput(localPath);
+
         if (isValid && errors.length === 0) {
-            element.classList.remove("invalid");
+            input.classList.remove("invalid");
 
             const linkEl = this.#getLinkElement(externalPath);
             if (linkEl) linkEl.classList.remove("required", "conditional");
@@ -691,7 +688,7 @@ export class JSONSchemaForm extends LitElement {
             return true;
         } else {
             // Add new invalid classes and errors
-            element.classList.add("invalid");
+            input.classList.add("invalid");
 
             const linkEl = this.#getLinkElement(externalPath);
             if (linkEl) linkEl.classList.add("required", "conditional");
diff --git a/src/renderer/src/stories/JSONSchemaInput.js b/src/renderer/src/stories/JSONSchemaInput.js
index 76a292498..a74c20532 100644
--- a/src/renderer/src/stories/JSONSchemaInput.js
+++ b/src/renderer/src/stories/JSONSchemaInput.js
@@ -30,6 +30,10 @@ export class JSONSchemaInput extends LitElement {
                 display: block;
             }
 
+            :host(.invalid) .guided--input {
+                background: rgb(255, 229, 228) !important;
+            }
+
             .guided--input {
                 width: 100%;
                 border-radius: 4px;
@@ -106,12 +110,16 @@ export class JSONSchemaInput extends LitElement {
     // onValidate = () => {}
 
     updateData(value) {
+        if (this.value === value) return false;
+
         const { path: fullPath } = this;
         const path = typeof fullPath === "string" ? fullPath.split("-") : [...fullPath];
         const name = path.splice(-1)[0];
-        const el = this.getElement();
-        this.#triggerValidation(name, el, path);
+
+        this.#triggerValidation(name, path);
         this.#updateData(fullPath, value);
+
+        const el = this.getElement();
         if (el.type === "checkbox") el.checked = value;
         else el.value = value;
 
@@ -143,9 +151,9 @@ export class JSONSchemaInput extends LitElement {
         this.#activateTimeoutValidation(name, this.getElement(), path);
     };
 
-    #triggerValidation = (name, el, path) => {
+    #triggerValidation = (name, path) => {
         this.#clearTimeoutValidation();
-        return this.onValidate ? this.onValidate() : this.form ? this.form.triggerValidation(name, el, path) : "";
+        return this.onValidate ? this.onValidate() : this.form ? this.form.triggerValidation(name, path) : "";
     };
 
     updated() {
@@ -189,7 +197,7 @@ export class JSONSchemaInput extends LitElement {
                 type: format,
                 value: this.value,
                 onSelect: (filePath) => this.#updateData(fullPath, filePath),
-                onChange: (filePath) => validateOnChange && this.#triggerValidation(name, el, path),
+                onChange: (filePath) => validateOnChange && this.#triggerValidation(name, path),
                 onThrow: (...args) => this.#onThrow(...args),
                 dialogOptions: this.form?.dialogOptions,
                 dialogType: this.form?.dialogType,
@@ -290,7 +298,7 @@ export class JSONSchemaInput extends LitElement {
                     : [],
                 onChange: async () => {
                     this.#updateData(fullPath, list.items.length ? list.items.map((o) => o.value) : undefined);
-                    if (validateOnChange) await this.#triggerValidation(name, list, path);
+                    if (validateOnChange) await this.#triggerValidation(name, path);
                 },
             });
 
@@ -303,10 +311,7 @@ export class JSONSchemaInput extends LitElement {
             });
 
             return html`
-                <div
-                    class="schema-input"
-                    @change=${() => validateOnChange && this.#triggerValidation(name, list, path)}
-                >
+                <div class="schema-input" @change=${() => validateOnChange && this.#triggerValidation(name, path)}>
                     ${list} ${addButton}
                 </div>
             `;
@@ -317,11 +322,8 @@ export class JSONSchemaInput extends LitElement {
             return html`
                 <select
                     class="guided--input schema-input"
-                    @input=${(ev) => {
-                        this.#updateData(fullPath, info.enum[ev.target.value]);
-                        this.#activateTimeoutValidation(name, ev.target, path);
-                    }}
-                    @change=${(ev) => validateOnChange && this.#triggerValidation(name, ev.target, path)}
+                    @input=${(ev) => this.#updateData(fullPath, info.enum[ev.target.value])}
+                    @change=${(ev) => validateOnChange && this.#triggerValidation(name, path)}
                 >
                     <option disabled selected value>${info.placeholder ?? "Select an option"}</option>
                     ${info.enum.map(
@@ -335,7 +337,7 @@ export class JSONSchemaInput extends LitElement {
                 class="schema-input"
                 @input=${(ev) => this.#updateData(fullPath, ev.target.checked)}
                 ?checked=${this.value ?? false}
-                @change=${(ev) => validateOnChange && this.#triggerValidation(name, ev.target, path)}
+                @change=${(ev) => validateOnChange && this.#triggerValidation(name, path)}
             />`;
         } else if (info.type === "string" || info.type === "number") {
             const fileSystemFormat = isFilesystemSelector(name, info.format);
@@ -352,7 +354,7 @@ export class JSONSchemaInput extends LitElement {
                     @input=${(ev) => {
                         this.#updateData(fullPath, ev.target.value);
                     }}
-                    @change=${(ev) => validateOnChange && this.#triggerValidation(name, ev.target, path)}
+                    @change=${(ev) => validateOnChange && this.#triggerValidation(name, path)}
                 ></textarea>`;
             // Handle other string formats
             else {
@@ -372,7 +374,7 @@ export class JSONSchemaInput extends LitElement {
                                 fullPath,
                                 info.type === "number" ? parseFloat(ev.target.value) : ev.target.value
                             )}
-                        @change=${(ev) => validateOnChange && this.#triggerValidation(name, ev.target, path)}
+                        @change=${(ev) => validateOnChange && this.#triggerValidation(name, path)}
                     />
                 `;
             }
diff --git a/src/renderer/src/stories/Main.js b/src/renderer/src/stories/Main.js
index ad813f477..70ed95cee 100644
--- a/src/renderer/src/stories/Main.js
+++ b/src/renderer/src/stories/Main.js
@@ -105,7 +105,6 @@ export class Main extends LitElement {
 
             // Default Capsules Behavior
             const section = sections[info.section];
-            console.log("Sections", section, sections);
             if (section) {
                 if (capsules === true || !("capsules" in page)) {
                     let pages = Object.values(section.pages);
diff --git a/src/renderer/src/stories/OptionalSection.js b/src/renderer/src/stories/OptionalSection.js
index 15347c59f..0dcde2050 100644
--- a/src/renderer/src/stories/OptionalSection.js
+++ b/src/renderer/src/stories/OptionalSection.js
@@ -11,11 +11,12 @@ export class OptionalSection extends LitElement {
 
             h2 {
                 margin: 0;
-                margin-bottom: 15px;
+                margin-bottom: 10px;
             }
 
             .optional-section__toggle {
-                padding-bottom: 20px;
+                margin: 10px 0px;
+                margin-bottom: 20px;
             }
 
             .optional-section__content {
@@ -24,12 +25,6 @@ export class OptionalSection extends LitElement {
         `;
     }
 
-    static get properties() {
-        return {
-            state: { type: Boolean, reflect: true },
-        };
-    }
-
     get hidden() {
         return this.shadowRoot.querySelector(".optional-section__content").hidden;
     }
diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedPathExpansion.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedPathExpansion.js
index f259b7c9a..80ab3e97c 100644
--- a/src/renderer/src/stories/pages/guided-mode/data/GuidedPathExpansion.js
+++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedPathExpansion.js
@@ -2,7 +2,6 @@ import { html } from "lit";
 import { Page } from "../../Page.js";
 
 // For Multi-Select Form
-import { notyf } from "../../../../dependencies/globals.js";
 import { JSONSchemaForm } from "../../../JSONSchemaForm.js";
 import { OptionalSection } from "../../../OptionalSection.js";
 import { run } from "../options/utils.js";
@@ -15,6 +14,7 @@ import { CodeBlock } from "../../../CodeBlock.js";
 import { List } from "../../../List";
 import { fs } from "../../../../electron/index.js";
 import { joinPath } from "../../../../globals.js";
+import { JSONSchemaInput } from "../../../JSONSchemaInput.js";
 
 const exampleFileStructure = `mylab/
     ¦   Subjects/
@@ -37,8 +37,8 @@ const exampleFileStructure = `mylab/
 const exampleFormatPath =
     "Subjects/{subject_id}/{session_start_time:%Y-%m-%d}/{session_id}/raw_video_data/leftCamera.raw.{}.mp4";
 
-const pathExpansionInfoBox = new InfoBox({
-    header: "How do I use a Python format string for path expansion?",
+const infoBox = new InfoBox({
+    header: "How do I use a Python format string to locate my files?",
     content: html`
         <div>
             <p>
@@ -87,8 +87,6 @@ const pathExpansionInfoBox = new InfoBox({
     `,
 });
 
-pathExpansionInfoBox.style.margin = "10px 0px";
-
 function getFiles(dir) {
     const dirents = fs.readdirSync(dir, { withFileTypes: true });
     let entries = [];
@@ -111,43 +109,52 @@ export class GuidedPathExpansionPage extends Page {
     };
 
     beforeSave = async () => {
+        const keepExistingData = this.dataManagementForm.resolved.keep_existing_data;
+
         const globalState = this.info.globalState;
         merge({ structure: this.localState }, globalState); // Merge the actual entries into the structure
 
         const hidden = this.optional.hidden;
         globalState.structure.state = !hidden;
 
-        // Force single subject/session
         if (hidden) {
-            const source_data = {};
-            for (let key in globalState.interfaces) source_data[key] = {};
-
-            const existingMetadata =
-                globalState.results?.[this.altInfo.subject_id]?.[this.altInfo.session_id]?.metadata;
-
-            globalState.results = {
-                [this.altInfo.subject_id]: {
-                    [this.altInfo.session_id]: {
-                        source_data,
-                        metadata: {
-                            NWBFile: {
-                                session_id: this.altInfo.session_id,
-                                ...(existingMetadata?.NWBFile ?? {}),
-                            },
-                            Subject: {
-                                subject_id: this.altInfo.subject_id,
-                                ...(existingMetadata?.Subject ?? {}),
+            // Force single subject/session if not keeping existing data
+            if (!keepExistingData || !globalState.results) {
+                const existingMetadata =
+                    globalState.results?.[this.altInfo.subject_id]?.[this.altInfo.session_id]?.metadata;
+
+                const existingSourceData =
+                    globalState.results?.[this.altInfo.subject_id]?.[this.altInfo.session_id]?.source_data;
+
+                const source_data = {};
+                for (let key in globalState.interfaces) source_data[key] = existingSourceData?.[key] ?? {};
+
+                globalState.results = {
+                    [this.altInfo.subject_id]: {
+                        [this.altInfo.session_id]: {
+                            source_data,
+                            metadata: {
+                                NWBFile: {
+                                    session_id: this.altInfo.session_id,
+                                    ...(existingMetadata?.NWBFile ?? {}),
+                                },
+                                Subject: {
+                                    subject_id: this.altInfo.subject_id,
+                                    ...(existingMetadata?.Subject ?? {}),
+                                },
                             },
                         },
                     },
-                },
-            };
+                };
+            }
         }
 
         // Otherwise use path expansion to merge into existing subjects
         else if (!hidden && hidden !== undefined) {
             const structure = globalState.structure.results;
 
+            await this.form.validate();
+
             const finalStructure = {};
             for (let key in structure) {
                 const entry = { ...structure[key] };
@@ -173,17 +180,28 @@ export class GuidedPathExpansionPage extends Page {
             // Save an overall results object organized by subject and session
             merge({ results }, globalState);
 
-            // // NOTE: Current behavior is to ONLY add new results, not remove old ones
-            // // If we'd like, we could label sessions as user-defined so they never clear
-
-            // // Remove previous results that are no longer present
-            // const globalResults = this.info.globalState.results
-            // for (let sub in globalResults) {
-            //   for (let ses in globalResults[sub]) {
-            //     if (!results[sub]?.[ses]) delete globalResults[sub]?.[ses]
-            //   }
-            //   if (Object.keys(globalResults[sub]).length === 0) delete globalResults[sub]
-            // }
+            const globalResults = globalState.results;
+
+            if (!keepExistingData) {
+                for (let sub in globalResults) {
+                    const subRef = results[sub];
+                    if (!subRef) delete globalResults[sub]; // Delete removed subjects
+                    else {
+                        for (let ses in globalResults[sub]) {
+                            const sesRef = subRef[ses];
+
+                            if (!sesRef) delete globalResults[sub][ses]; // Delete removed sessions
+                            else {
+                                for (let name in sesRef.source_data) {
+                                    if (!sesRef.source_data[name]) delete sesRef.source_data[name]; // Delete removed interfaces
+                                }
+                            }
+                        }
+
+                        if (Object.keys(globalResults[sub]).length === 0) delete globalResults[sub]; // Delete empty subjects
+                    }
+                }
+            }
         }
     };
 
@@ -193,7 +211,7 @@ export class GuidedPathExpansionPage extends Page {
             await this.save(); // Save in case the request fails
 
             if (!this.optional.toggled) {
-                const message = "Please select a path expansion option.";
+                const message = "Please select an option.";
                 this.notify(message, "error");
                 throw new Error(message);
             }
@@ -225,21 +243,22 @@ export class GuidedPathExpansionPage extends Page {
     //   }
     // })
 
-    optional = new OptionalSection({
-        header: "Would you like to locate data programmatically?",
-        description: pathExpansionInfoBox,
-        onChange: () => (this.unsavedUpdates = true),
-        // altContent: this.altForm,
-    });
-
     localState = {};
 
     render() {
+        this.optional = new OptionalSection({
+            header: "Will you locate your files programmatically?",
+            description: infoBox,
+            onChange: () => (this.unsavedUpdates = true),
+            // altContent: this.altForm,
+        });
+
         const structureState = (this.localState = merge(this.info.globalState.structure, { results: {} }));
 
         const state = structureState.state;
-        if (state !== undefined) this.optional.state = state;
-        else pathExpansionInfoBox.open = true; // Open the info box if no option has been selected
+
+        this.optional.state = state;
+        if (state === undefined) infoBox.open = true; // Open the info box if no option has been selected
 
         // Require properties for all sources
         const generatedSchema = { type: "object", properties: {} };
@@ -252,17 +271,12 @@ export class GuidedPathExpansionPage extends Page {
         const form = (this.form = new JSONSchemaForm({
             ...structureState,
             onThrow,
+            requirementMode: "loose",
             validateOnChange: async (name, parent, parentPath) => {
                 const value = parent[name];
                 if (fs) {
                     if (name === "base_directory") {
-                        // for (const f of getFiles(value)) {
-                        //     console.log(f);
-                        //   }
-                        // const res = getFiles(value);
-
                         const input = form.getInput([...parentPath, "format_string_path"]);
-                        console.log(input);
                         input.updateData(input.value);
                     } else if (name === "format_string_path") {
                         const base_directory = [...parentPath, "base_directory"].reduce(
@@ -293,8 +307,6 @@ export class GuidedPathExpansionPage extends Page {
                             }
                         }
 
-                        console.log("Metadata Results for", interfaceName, results);
-
                         return [
                             {
                                 message: html` <h4 style="margin: 0;">Source Files Found</h4>
@@ -322,11 +334,24 @@ export class GuidedPathExpansionPage extends Page {
 
         this.optional.style.paddingTop = "10px";
 
-        this.optional.append(pathExpansionInfoBox, form);
+        this.dataManagementForm = new JSONSchemaForm({
+            results: { keep_existing_data: true },
+            schema: {
+                type: "object",
+                properties: {
+                    keep_existing_data: {
+                        type: "boolean",
+                        description: "Maintain data for subjects / sessions that are not located.",
+                    },
+                },
+            },
+        });
+
+        this.optional.append(form);
 
         form.style.width = "100%";
 
-        return this.optional;
+        return html`${this.dataManagementForm}${this.optional}`;
     }
 }