diff --git a/documentation/PROJECT_CRUD_V3_UPGRADE.md b/documentation/PROJECT_CRUD_V3_UPGRADE.md
index 72512e44..b2808462 100644
--- a/documentation/PROJECT_CRUD_V3_UPGRADE.md
+++ b/documentation/PROJECT_CRUD_V3_UPGRADE.md
@@ -46,7 +46,7 @@ Legacy patterns persisting in core logic and config modules.
 Specific UI components that make direct API calls instead of using store functions.
 
 - [ ] `src/lib/elements/element_data_store.svelte` (Direct `create_ae_obj_crud`)
-- [ ] `src/lib/elements/element_data_store_v2.svelte`
+- [x] `src/lib/elements/element_data_store_v2.svelte`
 - [ ] `src/routes/events/[event_id]/event_page_menu.svelte`
 - [ ] `src/routes/events/[event_id]/(pres_mgmt)/session/ae_comp__event_session_alert.svelte`
 - [ ] `src/routes/events/ae_comp__event_session_obj_li.svelte`
@@ -102,7 +102,7 @@ V3 returns detailed error metadata in the `meta.details` object.
 ## 5. Known Pitfalls
 
 ### A. The "Integer Trap" (Search Mapping)
-**Issue:** The backend automatically maps certain fields (like `account_id`) from string IDs to internal integers. 
+**Issue:** The backend automatically maps certain fields (like `account_id`) from string IDs to internal integers.
 **Symptom:** Providing a string ID in a search body that the backend maps to an integer can result in **Zero Results** if the underlying view expects a string.
 
 **Final Solution (Body + Header Injection):**
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/locations/locations_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/locations/locations_page_menu.svelte
index c3c61930..cbe9894f 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/locations/locations_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/locations/locations_page_menu.svelte
@@ -28,7 +28,7 @@
     // import { events_func } from '$lib/ae_events_functions';
 
     // import Element_ae_crud from '$lib/element_ae_crud.svelte';
-    import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
+    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
     import Comp__events_menu_nav from '../../../ae_comp__events_menu_nav.svelte';
 
     // let ae_tmp: key_val = {};
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte
index d45d3cb3..bcc58fcf 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte
@@ -8,10 +8,9 @@
     let { data, log_lvl = 0 }: Props = $props();
 
     // Imports (external and then internal)
-    import { browser } from '$app/environment';
-    import type { key_val } from '$lib/stores/ae_stores';
+    // import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
-    import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
+    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
 
     import { liveQuery } from 'dexie';
     import { Modal } from 'flowbite-svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
index fa9a70cf..cbc855d9 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
@@ -17,7 +17,7 @@
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { api } from '$lib/api/api';
-    import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
+    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
     // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 
     import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte
index 2ccd6db9..fecbbd9c 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte
@@ -31,7 +31,7 @@
     import { events_func } from '$lib/ae_events_functions';
 
     import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
-    import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
+    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
     import Comp__events_menu_nav from '../../../../ae_comp__events_menu_nav.svelte';
 
     let ae_tmp: key_val = $state({});
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
index 5dc89165..e5408568 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
@@ -19,7 +19,7 @@
     import { ae_util } from '$lib/ae_utils/ae_utils';
     // import { api } from '$lib/api';
     import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
-    // import Element_data_store from '$lib/element_data_store_v2.svelte';
+    // import Element_data_store from '$lib/element_data_store_v3.svelte';
     import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
     import { core_func } from '$lib/ae_core/ae_core_functions';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte
index 1dd40166..8f94ea54 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte
@@ -19,14 +19,11 @@
 
     // Imports
     import type { key_val } from '$lib/stores/ae_stores';
-    // import { ae_util } from '$lib/ae_utils/ae_utils';
-    // import { api, send_email } from '$lib/api';
     // import Element_ae_crud from '$lib/element_ae_crud.svelte';
-    // import Element_data_store from '$lib/element_data_store_v2.svelte';
+    // import Element_data_store from '$lib/element_data_store_v3.svelte';
 
-    // import { liveQuery } from "dexie";
     import { core_func } from '$lib/ae_core/ae_core_functions';
-    // import { db_events } from "$lib/ae_events/db_events";
+
     import {
         ae_snip,
         ae_loc,
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/reports/event_reports_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/reports/event_reports_page_menu.svelte
index 6d668719..726ecf8f 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/reports/event_reports_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/reports/event_reports_page_menu.svelte
@@ -26,7 +26,7 @@
     // import { events_func } from '$lib/ae_events_functions';
 
     // import Element_ae_crud from '$lib/element_ae_crud.svelte';
-    import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
+    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
     import Comp__events_menu_nav from '../../../ae_comp__events_menu_nav.svelte';
 
     let ae_tmp: key_val = {};
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.svelte
index 11e78ee0..d529d210 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.svelte
@@ -7,21 +7,20 @@
     let { data }: Props = $props();
 
     let log_lvl: number = $state(0);
-    // console.log(`ae_events_pres_mgmt event [session_id] +page.svelte data:`, data);
 
     // Imports
     import { Modal } from 'flowbite-svelte';
 
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
-    import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
+    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
 
-    let ae_promises: key_val = {};
-    let ae_tmp: key_val = {};
-    let ae_triggers: key_val = {};
+    // let ae_promises: key_val = {};
+    // let ae_tmp: key_val = {};
+    // let ae_triggers: key_val = {};
 
     import { liveQuery } from 'dexie';
-    import { core_func } from '$lib/ae_core/ae_core_functions';
+    // import { core_func } from '$lib/ae_core/ae_core_functions';
     import { db_events } from '$lib/ae_events/db_events';
     import {
         ae_snip,
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
index c0528bff..a34fb7cd 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
@@ -22,7 +22,7 @@
     import { events_func } from '$lib/ae_events_functions';
 
     // Import components and elements
-    import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
+    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
 
     // Local Variables
     let ae_promises: key_val = $state({});
@@ -95,29 +95,6 @@
             ...opt_out_do
         };
 
-        // let poc_kv_json_type = $lq__event_session_obj.poc_kv_json[poc_type];
-
-        // let data_out: key_val = {
-        //     // data_json: opt_out_do,
-        //     poc_kv_json: {
-        //         [poc_type]: {
-        //             poc_kv_json_type,
-        //             ...opt_out_do
-        //         }
-        //     }
-        // }
-
-        // ae_promises.update__event_session_obj__opt_out = await handle_update__event_presenter({
-        //     obj_type: 'event_presenter',
-        //     obj_id: $lq__event_session_obj?.event_presenter_id,
-        //     data: data_out
-        // });
-        // console.log(ae_promises.update__event_session_obj__opt_out);
-
-        // let event_session_data = {
-        //     poc_agree: false,
-        // }
-
         // Use this in the future if we need to store the agreements in a more complex way?
         // let event_session_data = {poc_kv_json: $lq__event_session_obj?.poc_kv_json};
         // console.log('event_session_data:', event_session_data);
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte
index b13103d1..22e3e36e 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte
@@ -37,7 +37,7 @@
     import { events_func } from '$lib/ae_events_functions';
 
     import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
-    import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
+    import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
     import Sign_in_out from '../../../sign_in_out.svelte';
     import Comp__events_menu_nav from '../../../../ae_comp__events_menu_nav.svelte';
     // import Comp__global_menu_opts from '$lib/ae_comp__global_menu_opts.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
index 1902e13e..5c534271 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
@@ -21,17 +21,16 @@
         console.log(`ae_events_pres_mgmt session_view.svelte`);
     }
 
-    // Imports (external and then internal)
-    // import { liveQuery } from "dexie";
+    // *** Import Svelte specific
     import { Modal } from 'flowbite-svelte';
-    // import { Clipboard } from "flowbite-svelte";
 
-    // const dispatch = createEventDispatcher();
+    // *** Import other supporting libraries
 
+    // *** Import Aether specific
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
-    // import Element_data_store from '$lib/element_data_store_v2.svelte';
+    // import Element_data_store from '$lib/element_data_store_v3.svelte';
     import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
     let ae_promises: key_val = $state({});