diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts
index de62bc34..af1bda6e 100644
--- a/src/lib/ae_events_stores.ts
+++ b/src/lib/ae_events_stores.ts
@@ -196,6 +196,7 @@ let events_local_data_struct: key_val = {
         show_content__session_search_help: true,
         show_content__session_view: null,
         show_content__session_qr: true,
+        hide__session_poc: true,
 
         show_content__disabled_files: false,
         show_content__hidden_files: false,
diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte
new file mode 100644
index 00000000..7e85a7b5
--- /dev/null
+++ b/src/lib/element_manage_event_file_li.svelte
@@ -0,0 +1,579 @@
+<script lang="ts">
+import { onMount } from 'svelte';
+import { clipboard } from '@skeletonlabs/skeleton';
+// import { liveQuery } from "dexie";
+
+import type { key_val } from '$lib/ae_stores';
+import { ae_util } from '$lib/ae_utils';
+import { api } from '$lib/api';
+// import Element_ae_crud from '$lib/element_ae_crud.svelte';
+// import Element_data_store from '$lib/element_data_store.svelte';
+
+// import { core_func } from '$lib/ae_core_functions';
+import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
+import { db_events } from "$lib/db_events";
+import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
+import { events_func } from '$lib/ae_events_functions';
+
+export let container_class_li: string|Array<string> = [];
+export let lq__event_file_obj_li: any;
+export let link_to_type: string;
+export let link_to_id: string;
+export let allow_basic: boolean = false;
+export let allow_moderator: boolean = false;
+export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
+
+// export let show_convert_btn: null|boolean = null;
+
+// let ae_placeholder_li: key_val = {};
+let ae_promises: key_val = {};
+let ae_tmp: key_val = {};
+ae_tmp.show__file_li = true;
+ae_tmp.show__direct_download = false;
+// let ae_triggers: key_val = {};
+
+// let dq__where_val: string = `${link_to_type}_id_random`;
+// let dq__where_eq_val: string = link_to_id;
+
+// let lq__event_file_obj_li = liveQuery(
+//     async () => await db_events.files
+//     .where(dq__where_val)
+//     .equals(dq__where_eq_val)
+//     .toArray()
+// );
+
+onMount(() => {
+    // console.log('Element - Manage Event File List');
+    // console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
+
+    // $slct_trigger = 'load__event_file_obj_li';
+});
+</script>
+
+
+<div
+    class="float-right flex flex-row items-center"
+    >
+    <button
+        type="button"
+        on:click={() => {
+            console.log('*** Refresh button clicked ***');
+
+            db_events.files.clear();
+
+            let params = {
+                qry__enabled: 'all',
+                qry__hidden: 'all',
+            }
+
+            events_func.handle_load_ae_obj_li__event_file({
+                api_cfg: $ae_api,
+                for_obj_type: link_to_type,
+                for_obj_id: link_to_id,
+                params: params,
+                try_cache: true
+            });
+
+            // ae_tmp.show__file_li = false;
+            // console.log(`$lq__event_file_obj_li:`, $lq__event_file_obj_li);
+            // $slct_trigger = 'load__event_file_obj_li';
+            // ae_tmp.show__file_li = true;
+        }}
+        class="btn btn-sm p-1 m-1 variant-soft-tertiary hover:variant-ghost-warning transition hover:transition-all *:hover:inline"
+        class:hidden={!$ae_loc.authenticated_access}
+        title="Refresh the list of files"
+        >
+        <span class="fas fa-sync-alt m-1"></span>
+        <div class="hidden">
+        Files
+        </div>
+    </button>
+
+    <button
+        type="button"
+        on:click={() => {
+            console.log('*** Show Alt Download button clicked ***');
+            ae_tmp.show__direct_download = !ae_tmp.show__direct_download;
+        }}
+        class="btn btn-sm p-1 m-1 variant-soft-tertiary hover:variant-ghost-warning transition hover:transition-all *:hover:inline"
+        class:hidden={!$ae_loc.trusted_access}
+        title="Toggle direct download link and copy link button"
+        >
+        <span class="fas fa-download m-1"></span>
+        <div class="hidden">
+        {ae_tmp.show__direct_download ? 'Alt On' : 'Alt Download Off'}
+        </div>
+    </button>
+</div>
+
+
+<section class="svelte_component event_file_uploaded_manage {container_class_li}"
+    class:text-sm={display_mode != 'default'}
+    >
+
+
+<h3
+    class="h6"
+    class:hidden={!$lq__event_file_obj_li?.length || display_mode != 'default'}
+    >
+    Manage Files:
+    <span class="font-bold bg-success-100 px-4 border rounded-lg border-success-200"
+        title="Files for {link_to_type ?? '-- not set --'}: {link_to_id ?? '-- not set --'} (files: {$lq__event_file_obj_li?.length ?? 'None'})"
+        >
+        <span class="fas fa-folder-open mx-1"></span>
+        {$lq__event_file_obj_li ? `${$lq__event_file_obj_li.length}x` : '-- none --'}
+    </span>
+</h3>
+
+{#if $lq__event_file_obj_li && $lq__event_file_obj_li.length}
+<div class="overflow-auto w-full">
+<table class="table-auto w-full">
+
+    {#if display_mode === 'default'}
+    <thead>
+        <tr>
+            <th class="text-center">Download File</th>
+            {#if display_mode === 'default'}
+            <th
+                class="text-center"
+                class:hidden={!allow_basic && !$ae_loc.trusted_access}
+                >Options</th>
+            {/if}
+            {#if display_mode === 'default'}
+            <th
+                class="text-center"
+                class:hidden={!allow_basic && !$ae_loc.trusted_access}
+                >Status</th>
+            {/if}
+            <th class="text-center">Meta</th>
+        </tr>
+    </thead>
+    {/if}
+
+    <tbody>
+
+{#each $lq__event_file_obj_li as event_file_obj}
+<tr
+    class="ae_obj obj_event_file border-t border-b border-gray-200 hover:bg-gray-50 hover:border-gray-300"
+    class:dim={event_file_obj?.hide}
+    >
+    <td class="event_file__file align-middle">
+        {#if $events_sess.pres_mgmt?.show_field_edit__filename != event_file_obj.event_file_id_random}
+        <button
+            disabled={!allow_basic && !allow_moderator && !$ae_loc.trusted_access}
+            on:click={() => {
+                // ae_promises[event_file_obj.event_file_id_random]
+                ae_promises[event_file_obj.event_file_id_random] = api.download_hosted_file({
+                    api_cfg: $ae_api,
+                    hosted_file_id: event_file_obj.hosted_file_id_random,
+                    return_file: true,
+                    filename: event_file_obj.filename,
+                    auto_download: true,
+                    log_lvl: 0
+                });
+
+                // window.postMessage({ type: 'download_event_file', event_file_id: event_file_obj.event_file_id_random, filename: event_file_obj.filename, auto_download: true }, '*');
+            }}
+            class="btn btn-sm lg:btn-md variant-soft-primary hover:variant-filled-primary min-w-72 lg:min-w-96"
+            title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
+            >
+            {#await ae_promises[event_file_obj.event_file_id_random]}
+                <span class="fas fa-spinner fa-spin mx-1"></span>
+                <span class="">
+                    Downloading
+                    {#if $ae_sess.api_download_kv[event_file_obj.hosted_file_id_random]}
+                        {$ae_sess.api_download_kv[event_file_obj.hosted_file_id_random].percent_completed}%
+                    {/if}
+                    :
+                </span>
+            {:then}
+                <!-- <span class="fas fa-download mx-1"></span> -->
+                <span class="fas fa-{ae_util.file_extension_icon(event_file_obj.extension)}"></span>
+                <!-- <span class="text-sm">
+                Download:
+                </span> -->
+            {/await}
+
+            <span class="grow">
+            {ae_util.shorten_filename({filename: event_file_obj.filename, max_length: 30})}
+            </span>
+
+            <span
+                class="badge variant-glass-success hover:variant-filled-success text-sm"
+                class:hidden={!event_file_obj.file_purpose}
+                >
+                {event_file_obj.file_purpose}
+            </span>
+        </button>
+        <a
+            href="{$ae_api.base_url}/event/file/{event_file_obj.event_file_id_random}/download?filename={event_file_obj.filename}&x_no_account_id_token=direct-download"
+            class="btn btn-sm variant-soft-secondary m-0.5 *:hover:inline"
+            class:hidden={!ae_tmp.show__direct_download}
+            title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
+            >
+            <span class="fas fa-download mx-1"></span>
+            <div class="hidden">
+            Download
+            </div>
+        </a>
+        <button
+            type="button"
+            use:clipboard={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj.event_file_id_random}/download?filename=${event_file_obj.filename}&x_no_account_id_token=direct-download`)}
+            class="btn btn-sm variant-soft-secondary m-0.5 *:hover:inline"
+            class:hidden={!ae_tmp.show__direct_download}
+            title="Copy the direct download file link to the clipboard."
+            >
+            <span class="fas fa-copy mx-1"></span>
+            <div class="hidden">
+            Copy Link
+            </div>
+        </button>
+        {:else}
+        <!-- Show change filename input field here -->
+         <span
+            class="flex flex-col gap-1 text-sm"
+            >
+            <input
+                type="text"
+                size="12"
+                placeholder="Filename"
+                bind:value="{$events_sess.pres_mgmt.tmp_val__filename_no_ext}"
+                data-original_value="{event_file_obj.filename}"
+                class="input min-w-72 lg:min-w-96 text-sm bg-warning-100"
+                title="Rename this file. No extension."
+                >
+            {#if $events_sess.pres_mgmt.tmp_val__filename_no_ext.trim() != event_file_obj.filename_no_ext}
+            <button
+                on:click={async () => {
+                    let new_filename = $events_sess.pres_mgmt.tmp_val__filename_no_ext.trim()
+                    // Remove possible double extension
+                    new_filename = new_filename.replace('.'+event_file_obj.extension, '');
+
+                    // Add the extension back
+                    new_filename = new_filename + '.' + event_file_obj.extension;
+
+                    // Remove any double dots
+                    new_filename = new_filename.replace(/\.\./g, '.');
+
+                    let event_file_data = {
+                        filename: new_filename,
+                    };
+
+                    ae_promises.update__event_file_obj = events_func.handle_update_ae_obj__event_file({
+                        api_cfg: $ae_api,
+                        event_file_id: event_file_obj.event_file_id_random,
+                        data_kv: event_file_data,
+                        log_lvl: 0
+                    })
+                    .then (function (update_results) {
+                        console.log(`Update results:`, update_results);
+                        $events_sess.pres_mgmt.show_field_edit__filename = false;
+                    });
+                }}
+                class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
+                title="Save changes"
+                >
+                {#await ae_promises.update__event_file_obj}
+                    <span class="fas fa-spinner fa-spin mx-1"></span>
+                    <span class="">Saving {event_file_obj.extension}</span>
+                {:then}
+                    <span class="fas fa-save mx-1"></span>
+                    Save {event_file_obj.extension} filename?
+                {/await}
+            </button>
+            {/if}
+        </span>
+        {/if}
+
+    </td>
+
+    {#if display_mode === 'default'}
+    <td
+        class="event_file__options"
+        class:hidden={!allow_basic && !$ae_loc.trusted_access}
+        >
+        <div class="flex flex-col gap-1 text-sm">
+        <button
+            disabled={!allow_basic && !$ae_loc.trusted_access}
+            on:click={() => {
+                if ($events_sess.pres_mgmt.show_field_edit__filename == event_file_obj.event_file_id_random) {
+                    $events_sess.pres_mgmt.tmp_val__filename_no_ext = '';
+                    $events_sess.pres_mgmt.show_field_edit__filename = false;
+                } else {
+                    $events_sess.pres_mgmt.tmp_val__filename_no_ext = event_file_obj.filename_no_ext;
+                    $events_sess.pres_mgmt.show_field_edit__filename = event_file_obj.event_file_id_random;
+                }
+            }}
+            class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
+            class:variant-glass-warning={$events_sess.pres_mgmt.show_field_edit__filename == event_file_obj.event_file_id_random}
+            title={`Rename this file? "${event_file_obj.filename}"`}
+            >
+            <span class="fas fa-edit mx-1"></span>
+            {#if $events_sess.pres_mgmt?.show_field_edit__filename == event_file_obj.event_file_id_random}
+                Cancel?
+            {:else}
+                Rename
+            {/if}
+        </button>
+
+        <button
+            disabled={!allow_basic && !$ae_loc.trusted_access}
+            on:click={async () => {
+                let event_file_data = {
+                    hide: !event_file_obj.hide,
+                };
+
+                ae_promises.update__event_file_obj = events_func.handle_update_ae_obj__event_file({
+                    api_cfg: $ae_api,
+                    event_file_id: event_file_obj.event_file_id_random,
+                    data_kv: event_file_data,
+                    log_lvl: 1
+                })
+                .then (function (update_results) {
+                    console.log(`Update results:`, update_results);
+
+                    let params = {
+                        qry__enabled: 'all',
+                        qry__hidden: 'all',
+                    }
+
+                    events_func.handle_load_ae_obj_li__event_file({
+                        api_cfg: $ae_api,
+                        for_obj_type: link_to_type,
+                        for_obj_id: link_to_id,
+                        params: params,
+                        try_cache: true
+                    });
+                });
+            }}
+            class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
+            title="Hide this file from the presentation launcher"
+            >
+
+            <!-- Users see this as the "Archive" option button -->
+            <!-- {@html (event_file_obj?.hide ? '<span class="fas fa-archive m-1"></span> Unarchive' : '<span class="fas fa-archive m-1"></span> Archive')} -->
+
+            {#await ae_promises.update__event_file_obj}
+                <span class="fas fa-spinner fa-spin mx-1"></span>
+                <span class="">Saving {event_file_obj.extension}</span>
+            {:then}
+                {#if event_file_obj.hide}
+                <span class="fas fa-eye m-1"></span> Unhide File
+                {:else}
+                <span class="fas fa-eye-slash m-1"></span> Hide
+                {/if}
+
+                <!-- {@html (event_file_obj?.hide ? '<span class="fas fa-eye m-1"></span> Unhide?' : '<span class="fas fa-eye-slash m-1"></span> Hide?')} -->
+                <!-- <span class="fas fa-save mx-1"></span>
+                Save {event_file_obj.extension} filename? -->
+            {/await}
+        </button>
+
+
+
+        <button
+            disabled={!allow_basic && !$ae_loc.trusted_access}
+            on:click={async () => {
+                if (!confirm(`Are you sure you want to delete this file?\n${event_file_obj.filename} [${event_file_obj.event_file_id_random}]`)) {return false;}
+
+                // ae_promises[event_file_obj.event_file_id_random] = handle_delete__event_file({event_file_id: event_file_obj.event_file_id_random});
+
+                ae_promises.delete__event_file_obj = await events_func.handle_delete_ae_obj_id__event_file({
+                    api_cfg: $ae_api,
+                    event_file_id: event_file_obj.event_file_id_random,
+                    log_lvl: 1
+                })
+            }}
+            class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
+            title="Delete this file"
+            >
+            <span class="fas fa-trash-alt mx-1"></span>
+            <!-- <span class="fas fa-minus mx-1"></span> -->
+            Delete
+        </button>
+        </div>
+    </td>
+    {/if}
+
+    {#if display_mode === 'default'}
+    <td
+        class="event_file__status"
+        class:hidden={!allow_basic && !$ae_loc.trusted_access}
+        >
+        <div class="flex flex-col gap-1 items-center text-sm">
+
+        <div class="">
+            {#if event_file_obj.open_in_os == 'win'}
+
+                MS Windows <span class="fab fa-windows"></span>
+
+            {:else if event_file_obj.open_in_os == 'mac'}
+
+                Apple macOS <span class="fab fa-apple"></span>
+
+            {/if}
+        </div>
+
+        <!-- Select from options for the purpose of this file -->
+        <div>
+            <label
+                for="file_purpose"
+                class="text-sm mx-1 hidden"
+                >
+                Purpose:
+            </label>
+            <select
+                id="file_purpose"
+                name="file_purpose"
+                disabled={!allow_basic && !allow_moderator && !$ae_loc.trusted_access}
+                value={event_file_obj.file_purpose}
+                on:change={e => {
+                    // ae_tmp[event_file_obj.event_file_id_random].file_purpose = e.target.value;
+                    console.log(`Selected file_purpose: ${e.target.value}`);
+
+                    let event_file_data = {
+                        event_file_id_random: event_file_obj.event_file_id_random,
+                        file_purpose: e.target.value,
+                    };
+
+                    events_func.handle_update_ae_obj__event_file({
+                            api_cfg: $ae_api,
+                            event_file_id: event_file_obj.event_file_id_random,
+                            data_kv: event_file_data,
+                            log_lvl: 1
+                    })
+                    .then (function (update_results) {
+                        console.log(`Update results:`, update_results);
+                        $slct_trigger = 'load__event_file_obj_li';
+                    });
+
+
+
+                    // ae_triggers.update_event_file_purpose = true;
+                }}
+                class="select min-w-fit max-w-fit text-sm mx-1 border border-gray-300 rounded-md p-1 hover:border-gray-400"
+                >
+                <option value={null} selected={!event_file_obj.file_purpose} class="text-xs">-- purpose not set --</option>
+                <option value="outline" selected={event_file_obj.file_purpose === 'outline'}>1. Outline</option>
+                <option value="draft" selected={event_file_obj.file_purpose === 'draft'}>2. Draft</option>
+                <option value="final" selected={event_file_obj.file_purpose === 'final'}>3. Final</option>
+                <!-- <option value="supporting">X. Supporting File (audio, video, data, etc)</option> -->
+                <!-- <option value="handout">X. Handout</option> -->
+                <option value="other">X. Other</option>
+                <!-- <option value="poster">Final - Poster</option> -->
+                <!-- <option value="presentation">Final - Presentation</option> -->
+                <!-- Shows in session room -->
+            </select>
+        </div>
+
+        </div>
+
+    </td>
+    {/if}
+
+    <td class="event_file_info file_meta text-gray-500">
+        <div
+            class="flex flex-col gap-0.5 text-xs"
+
+            >
+        <!-- {event_file_obj.hosted_file_content_type} -->
+
+        <span class="w-full flex flex-col lg:flex-row justify-between">
+        <span
+            class:hidden={display_mode != 'default'}
+            >
+            Type:
+            <strong>{event_file_obj.extension} <span class="fas fa-{ae_util.file_extension_icon(event_file_obj.extension)}"></span>
+            </strong>
+            <!-- {#if event_file_obj.open_in_os == 'win'}
+                <strong>
+                MS Windows <span class="fab fa-windows"></span>
+                </strong>
+            {:else if event_file_obj.open_in_os == 'mac'}
+                <strong>
+                Apple macOS <span class="fab fa-apple"></span>
+                </strong>
+            {/if} -->
+
+        </span>
+        <span>
+            <span
+                class:hidden={display_mode != 'default'}
+                >
+                Size:
+            </span>
+            <strong>{ae_util.format_bytes(event_file_obj.file_size)}</strong>
+        </span>
+        </span>
+
+        <span class="w-full flex flex-col lg:flex-row justify-between">
+        <span title="SHA 256: {event_file_obj.hash_sha256}">
+            <span
+                class:hidden={display_mode != 'default'}
+                >
+                Hash:
+            </span>
+            <strong
+                class:font-normal={display_mode != 'default'}
+                >{event_file_obj.hash_sha256.slice(0, 10)}&mldr;</strong>
+        </span>
+        <span
+            class:hidden={!$ae_loc.administrator_access || display_mode != 'default'}>
+            <span
+                class:hidden={display_mode != 'default'}
+                >
+                ID:
+            </span>
+            <strong>{event_file_obj.hosted_file_id_random}</strong>
+        </span>
+        </span>
+
+        <span>
+            {#if display_mode == 'default'}
+                <!-- <span class="fas fa-cloud-upload-alt mx-1"></span> -->
+                <!-- Uploaded: -->
+                <!-- <span class="fas fa-calendar-day mx-1"></span> -->
+                <span class="fas fa-clock mx-1"></span>
+                <strong>
+                {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'dddd')}
+                </strong>
+                {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_iso')}
+                at
+                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')}</strong>
+                <!-- {event_file_obj.updated_on} -->
+             {:else}
+                <!-- <span class="fas fa-calendar-day mx-1"></span> -->
+                <strong>
+                {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_short')}
+                <!-- at -->
+                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')}</strong>
+                </strong>
+            {/if}
+        </span>
+
+        </div>
+    </td>
+</tr>
+{/each}
+
+    </tbody>
+</table>
+</div>
+
+{:else}
+
+<p
+    class="w-96 text-center text-gray-500"
+    class:hidden={display_mode != 'default'}
+    >
+    No files uploaded to display
+</p>
+
+{/if}
+
+</section>
+
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/lib/element_manage_event_file_li_all.svelte b/src/lib/element_manage_event_file_li_all.svelte
index b5a91584..fb5f51e6 100644
--- a/src/lib/element_manage_event_file_li_all.svelte
+++ b/src/lib/element_manage_event_file_li_all.svelte
@@ -1,19 +1,20 @@
 <script lang="ts">
 import { onMount } from 'svelte';
-import { clipboard } from '@skeletonlabs/skeleton';
+// import { clipboard } from '@skeletonlabs/skeleton';
 import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
-import { api } from '$lib/api';
+// import { ae_util } from '$lib/ae_utils';
+// import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store.svelte';
+import Element_manage_event_file_li from '$lib/element_manage_event_file_li.svelte';
 
-import { core_func } from '$lib/ae_core_functions';
+// import { core_func } from '$lib/ae_core_functions';
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { db_events } from "$lib/db_events";
-import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
-import { events_func } from '$lib/ae_events_functions';
+// import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
+// import { events_func } from '$lib/ae_events_functions';
 
 export let container_class_li: string|Array<string> = [];
 export let link_to_type: string;
@@ -25,7 +26,7 @@ export let display_mode: string = 'default'; // 'default', 'compact', 'minimal',
 // export let show_convert_btn: null|boolean = null;
 
 // let ae_placeholder_li: key_val = {};
-let ae_promises: key_val = {};
+// let ae_promises: key_val = {};
 let ae_tmp: key_val = {};
 ae_tmp.show__file_li = true;
 ae_tmp.show__direct_download = false;
@@ -49,528 +50,13 @@ onMount(() => {
 });
 </script>
 
-<span
-    class="float-right"
-    >
-    <button
-        type="button"
-        on:click={() => {
-            console.log('*** Refresh button clicked ***');
 
-            db_events.files.clear();
-
-            let params = {
-                qry__enabled: 'all',
-                qry__hidden: 'all',
-            }
-
-            events_func.handle_load_ae_obj_li__event_file({
-                api_cfg: $ae_api,
-                for_obj_type: link_to_type,
-                for_obj_id: link_to_id,
-                params: params,
-                try_cache: true
-            });
-
-            // ae_tmp.show__file_li = false;
-            // console.log(`$lq__event_file_obj_li:`, $lq__event_file_obj_li);
-            // $slct_trigger = 'load__event_file_obj_li';
-            // ae_tmp.show__file_li = true;
-        }}
-        class="btn btn-sm p-1 m-1 variant-soft-tertiary hover:variant-ghost-warning transition hover:transition-all *:hover:inline"
-        class:hidden={!$ae_loc.authenticated_access}
-        title="Refresh the list of files"
-        >
-        <span class="fas fa-sync-alt mx-1"></span>
-        <div class="hidden">
-        Files
-        </div>
-    </button>
-
-    <button
-        type="button"
-        on:click={() => {
-            console.log('*** Show Alt Download button clicked ***');
-            ae_tmp.show__direct_download = !ae_tmp.show__direct_download;
-        }}
-        class="btn btn-sm p-1 m-1 variant-soft-tertiary hover:variant-ghost-warning transition hover:transition-all *:hover:inline"
-        class:hidden={!$ae_loc.trusted_access}
-        title="Toggle direct download link and copy link button"
-        >
-        <span class="fas fa-download mx-1"></span>
-        <div class="hidden">
-        {ae_tmp.show__direct_download ? 'Alt On' : 'Alt Download Off'}
-        </div>
-    </button>
-</span>
-
-<section class="svelte_component event_file_uploaded_manage {container_class_li}"
-    class:text-sm={display_mode != 'default'}
-    >
-
-
-<h3
-    class="h6"
-    class:hidden={!$lq__event_file_obj_li?.length || display_mode != 'default'}
-    >
-    Manage Files:
-    <span class="font-bold bg-success-100 px-4 border rounded-lg border-success-200"
-        title="Files for {link_to_type ?? '-- not set --'}: {link_to_id ?? '-- not set --'} (files: {$lq__event_file_obj_li?.length ?? 'None'})"
-        >
-        <span class="fas fa-folder-open mx-1"></span>
-        {$lq__event_file_obj_li ? `${$lq__event_file_obj_li.length}x` : '-- none --'}
-    </span>
-</h3>
-
-{#if $lq__event_file_obj_li && $lq__event_file_obj_li.length}
-<div class="overflow-auto w-full">
-<table class="table-auto w-full">
-
-    {#if display_mode === 'default'}
-    <thead>
-        <tr>
-            <th class="text-center">Download File</th>
-            {#if display_mode === 'default'}
-            <th
-                class="text-center"
-                class:hidden={!allow_basic && !$ae_loc.trusted_access}
-                >Options</th>
-            {/if}
-            {#if display_mode === 'default'}
-            <th
-                class="text-center"
-                class:hidden={!allow_basic && !$ae_loc.trusted_access}
-                >Status</th>
-            {/if}
-            <th class="text-center">Meta</th>
-        </tr>
-    </thead>
-    {/if}
-
-    <tbody>
-
-{#each $lq__event_file_obj_li as event_file_obj}
-<tr
-    class="ae_obj obj_event_file border-t border-b border-gray-200 hover:bg-gray-50 hover:border-gray-300"
-    class:dim={event_file_obj?.hide}
-    >
-    <td class="event_file__file align-middle">
-        {#if $events_sess.pres_mgmt?.show_field_edit__filename != event_file_obj.event_file_id_random}
-        <button
-            disabled={!allow_basic && !allow_moderator && !$ae_loc.trusted_access}
-            on:click={() => {
-                // ae_promises[event_file_obj.event_file_id_random]
-                ae_promises[event_file_obj.event_file_id_random] = api.download_hosted_file({
-                    api_cfg: $ae_api,
-                    hosted_file_id: event_file_obj.hosted_file_id_random,
-                    return_file: true,
-                    filename: event_file_obj.filename,
-                    auto_download: true,
-                    log_lvl: 0
-                });
-
-                // window.postMessage({ type: 'download_event_file', event_file_id: event_file_obj.event_file_id_random, filename: event_file_obj.filename, auto_download: true }, '*');
-            }}
-            class="btn btn-sm lg:btn-md variant-soft-primary hover:variant-filled-primary min-w-72 lg:min-w-96"
-            title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
-            >
-            {#await ae_promises[event_file_obj.event_file_id_random]}
-                <span class="fas fa-spinner fa-spin mx-1"></span>
-                <span class="">
-                    Downloading
-                    {#if $ae_sess.api_download_kv[event_file_obj.hosted_file_id_random]}
-                        {$ae_sess.api_download_kv[event_file_obj.hosted_file_id_random].percent_completed}%
-                    {/if}
-                    :
-                </span>
-            {:then}
-                <!-- <span class="fas fa-download mx-1"></span> -->
-                <span class="fas fa-{ae_util.file_extension_icon(event_file_obj.extension)}"></span>
-                <!-- <span class="text-sm">
-                Download:
-                </span> -->
-            {/await}
-
-            <span class="grow">
-            {ae_util.shorten_filename({filename: event_file_obj.filename, max_length: 30})}
-            </span>
-
-            <span
-                class="badge variant-glass-success hover:variant-filled-success text-sm"
-                class:hidden={!event_file_obj.file_purpose}
-                >
-                {event_file_obj.file_purpose}
-            </span>
-        </button>
-        <a
-            href="{$ae_api.base_url}/event/file/{event_file_obj.event_file_id_random}/download?filename={event_file_obj.filename}&x_no_account_id_token=direct-download"
-            class="btn btn-sm variant-soft-secondary m-0.5 *:hover:inline"
-            class:hidden={!ae_tmp.show__direct_download}
-            title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
-            >
-            <span class="fas fa-download mx-1"></span>
-            <div class="hidden">
-            Download
-            </div>
-        </a>
-        <button
-            type="button"
-            use:clipboard={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj.event_file_id_random}/download?filename=${event_file_obj.filename}&x_no_account_id_token=direct-download`)}
-            class="btn btn-sm variant-soft-secondary m-0.5 *:hover:inline"
-            class:hidden={!ae_tmp.show__direct_download}
-            title="Copy the direct download file link to the clipboard."
-            >
-            <span class="fas fa-copy mx-1"></span>
-            <div class="hidden">
-            Copy Link
-            </div>
-        </button>
-        {:else}
-        <!-- Show change filename input field here -->
-         <span
-            class="flex flex-col gap-1 text-sm"
-            >
-            <input
-                type="text"
-                size="12"
-                placeholder="Filename"
-                bind:value="{$events_sess.pres_mgmt.tmp_val__filename_no_ext}"
-                data-original_value="{event_file_obj.filename}"
-                class="input min-w-72 lg:min-w-96 text-sm bg-warning-100"
-                title="Rename this file. No extension."
-                >
-            {#if $events_sess.pres_mgmt.tmp_val__filename_no_ext.trim() != event_file_obj.filename_no_ext}
-            <button
-                on:click={async () => {
-                    let new_filename = $events_sess.pres_mgmt.tmp_val__filename_no_ext.trim()
-                    // Remove possible double extension
-                    new_filename = new_filename.replace('.'+event_file_obj.extension, '');
-
-                    // Add the extension back
-                    new_filename = new_filename + '.' + event_file_obj.extension;
-
-                    // Remove any double dots
-                    new_filename = new_filename.replace(/\.\./g, '.');
-
-                    let event_file_data = {
-                        filename: new_filename,
-                    };
-
-                    ae_promises.update__event_file_obj = events_func.handle_update_ae_obj__event_file({
-                        api_cfg: $ae_api,
-                        event_file_id: event_file_obj.event_file_id_random,
-                        data_kv: event_file_data,
-                        log_lvl: 0
-                    })
-                    .then (function (update_results) {
-                        console.log(`Update results:`, update_results);
-                        $events_sess.pres_mgmt.show_field_edit__filename = false;
-                    });
-                }}
-                class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
-                title="Save changes"
-                >
-                {#await ae_promises.update__event_file_obj}
-                    <span class="fas fa-spinner fa-spin mx-1"></span>
-                    <span class="">Saving {event_file_obj.extension}</span>
-                {:then}
-                    <span class="fas fa-save mx-1"></span>
-                    Save {event_file_obj.extension} filename?
-                {/await}
-            </button>
-            {/if}
-        </span>
-        {/if}
-
-    </td>
-
-    {#if display_mode === 'default'}
-    <td
-        class="event_file__options"
-        class:hidden={!allow_basic && !$ae_loc.trusted_access}
-        >
-        <div class="flex flex-col gap-1 text-sm">
-        <button
-            disabled={!allow_basic && !$ae_loc.trusted_access}
-            on:click={() => {
-                if ($events_sess.pres_mgmt.show_field_edit__filename == event_file_obj.event_file_id_random) {
-                    $events_sess.pres_mgmt.tmp_val__filename_no_ext = '';
-                    $events_sess.pres_mgmt.show_field_edit__filename = false;
-                } else {
-                    $events_sess.pres_mgmt.tmp_val__filename_no_ext = event_file_obj.filename_no_ext;
-                    $events_sess.pres_mgmt.show_field_edit__filename = event_file_obj.event_file_id_random;
-                }
-            }}
-            class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
-            class:variant-glass-warning={$events_sess.pres_mgmt.show_field_edit__filename == event_file_obj.event_file_id_random}
-            title={`Rename this file? "${event_file_obj.filename}"`}
-            >
-            <span class="fas fa-edit mx-1"></span>
-            {#if $events_sess.pres_mgmt?.show_field_edit__filename == event_file_obj.event_file_id_random}
-                Cancel?
-            {:else}
-                Rename
-            {/if}
-        </button>
-
-        <button
-            disabled={!allow_basic && !$ae_loc.trusted_access}
-            on:click={async () => {
-                let event_file_data = {
-                    hide: !event_file_obj.hide,
-                };
-
-                ae_promises.update__event_file_obj = events_func.handle_update_ae_obj__event_file({
-                    api_cfg: $ae_api,
-                    event_file_id: event_file_obj.event_file_id_random,
-                    data_kv: event_file_data,
-                    log_lvl: 1
-                })
-                .then (function (update_results) {
-                    console.log(`Update results:`, update_results);
-
-                    let params = {
-                        qry__enabled: 'all',
-                        qry__hidden: 'all',
-                    }
-
-                    events_func.handle_load_ae_obj_li__event_file({
-                        api_cfg: $ae_api,
-                        for_obj_type: link_to_type,
-                        for_obj_id: link_to_id,
-                        params: params,
-                        try_cache: true
-                    });
-                });
-            }}
-            class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
-            title="Hide this file from the presentation launcher"
-            >
-
-            <!-- Users see this as the "Archive" option button -->
-            <!-- {@html (event_file_obj?.hide ? '<span class="fas fa-archive m-1"></span> Unarchive' : '<span class="fas fa-archive m-1"></span> Archive')} -->
-
-            {#await ae_promises.update__event_file_obj}
-                <span class="fas fa-spinner fa-spin mx-1"></span>
-                <span class="">Saving {event_file_obj.extension}</span>
-            {:then}
-                {#if event_file_obj.hide}
-                <span class="fas fa-eye m-1"></span> Unhide File
-                {:else}
-                <span class="fas fa-eye-slash m-1"></span> Hide
-                {/if}
-
-                <!-- {@html (event_file_obj?.hide ? '<span class="fas fa-eye m-1"></span> Unhide?' : '<span class="fas fa-eye-slash m-1"></span> Hide?')} -->
-                <!-- <span class="fas fa-save mx-1"></span>
-                Save {event_file_obj.extension} filename? -->
-            {/await}
-        </button>
-
-
-
-        <button
-            disabled={!allow_basic && !$ae_loc.trusted_access}
-            on:click={async () => {
-                if (!confirm(`Are you sure you want to delete this file?\n${event_file_obj.filename} [${event_file_obj.event_file_id_random}]`)) {return false;}
-
-                // ae_promises[event_file_obj.event_file_id_random] = handle_delete__event_file({event_file_id: event_file_obj.event_file_id_random});
-
-                ae_promises.delete__event_file_obj = await events_func.handle_delete_ae_obj_id__event_file({
-                    api_cfg: $ae_api,
-                    event_file_id: event_file_obj.event_file_id_random,
-                    log_lvl: 1
-                })
-            }}
-            class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
-            title="Delete this file"
-            >
-            <span class="fas fa-trash-alt mx-1"></span>
-            <!-- <span class="fas fa-minus mx-1"></span> -->
-            Delete
-        </button>
-        </div>
-    </td>
-    {/if}
-
-    {#if display_mode === 'default'}
-    <td
-        class="event_file__status"
-        class:hidden={!allow_basic && !$ae_loc.trusted_access}
-        >
-        <div class="flex flex-col gap-1 items-center text-sm">
-
-        <div class="">
-            {#if event_file_obj.open_in_os == 'win'}
-
-                MS Windows <span class="fab fa-windows"></span>
-
-            {:else if event_file_obj.open_in_os == 'mac'}
-
-                Apple macOS <span class="fab fa-apple"></span>
-
-            {/if}
-        </div>
-
-        <!-- Select from options for the purpose of this file -->
-        <div>
-            <label
-                for="file_purpose"
-                class="text-sm mx-1 hidden"
-                >
-                Purpose:
-            </label>
-            <select
-                id="file_purpose"
-                name="file_purpose"
-                disabled={!allow_basic && !allow_moderator && !$ae_loc.trusted_access}
-                value={event_file_obj.file_purpose}
-                on:change={e => {
-                    // ae_tmp[event_file_obj.event_file_id_random].file_purpose = e.target.value;
-                    console.log(`Selected file_purpose: ${e.target.value}`);
-
-                    let event_file_data = {
-                        event_file_id_random: event_file_obj.event_file_id_random,
-                        file_purpose: e.target.value,
-                    };
-
-                    events_func.handle_update_ae_obj__event_file({
-                            api_cfg: $ae_api,
-                            event_file_id: event_file_obj.event_file_id_random,
-                            data_kv: event_file_data,
-                            log_lvl: 1
-                    })
-                    .then (function (update_results) {
-                        console.log(`Update results:`, update_results);
-                        $slct_trigger = 'load__event_file_obj_li';
-                    });
-
-
-
-                    // ae_triggers.update_event_file_purpose = true;
-                }}
-                class="select min-w-fit max-w-fit text-sm mx-1 border border-gray-300 rounded-md p-1 hover:border-gray-400"
-                >
-                <option value={null} selected={!event_file_obj.file_purpose} class="text-xs">-- purpose not set --</option>
-                <option value="outline" selected={event_file_obj.file_purpose === 'outline'}>1. Outline</option>
-                <option value="draft" selected={event_file_obj.file_purpose === 'draft'}>2. Draft</option>
-                <option value="final" selected={event_file_obj.file_purpose === 'final'}>3. Final</option>
-                <!-- <option value="supporting">X. Supporting File (audio, video, data, etc)</option> -->
-                <!-- <option value="handout">X. Handout</option> -->
-                <option value="other">X. Other</option>
-                <!-- <option value="poster">Final - Poster</option> -->
-                <!-- <option value="presentation">Final - Presentation</option> -->
-                <!-- Shows in session room -->
-            </select>
-        </div>
-
-        </div>
-
-    </td>
-    {/if}
-
-    <td class="event_file_info file_meta text-gray-500">
-        <div
-            class="flex flex-col gap-0.5 text-xs"
-
-            >
-        <!-- {event_file_obj.hosted_file_content_type} -->
-
-        <span class="w-full flex flex-col lg:flex-row justify-between">
-        <span
-            class:hidden={display_mode != 'default'}
-            >
-            Type:
-            <strong>{event_file_obj.extension} <span class="fas fa-{ae_util.file_extension_icon(event_file_obj.extension)}"></span>
-            </strong>
-            <!-- {#if event_file_obj.open_in_os == 'win'}
-                <strong>
-                MS Windows <span class="fab fa-windows"></span>
-                </strong>
-            {:else if event_file_obj.open_in_os == 'mac'}
-                <strong>
-                Apple macOS <span class="fab fa-apple"></span>
-                </strong>
-            {/if} -->
-
-        </span>
-        <span>
-            <span
-                class:hidden={display_mode != 'default'}
-                >
-                Size:
-            </span>
-            <strong>{ae_util.format_bytes(event_file_obj.file_size)}</strong>
-        </span>
-        </span>
-
-        <span class="w-full flex flex-col lg:flex-row justify-between">
-        <span title="SHA 256: {event_file_obj.hash_sha256}">
-            <span
-                class:hidden={display_mode != 'default'}
-                >
-                Hash:
-            </span>
-            <strong
-                class:font-normal={display_mode != 'default'}
-                >{event_file_obj.hash_sha256.slice(0, 10)}&mldr;</strong>
-        </span>
-        <span
-            class:hidden={!$ae_loc.administrator_access || display_mode != 'default'}>
-            <span
-                class:hidden={display_mode != 'default'}
-                >
-                ID:
-            </span>
-            <strong>{event_file_obj.hosted_file_id_random}</strong>
-        </span>
-        </span>
-
-        <span>
-            {#if display_mode == 'default'}
-                <!-- <span class="fas fa-cloud-upload-alt mx-1"></span> -->
-                <!-- Uploaded: -->
-                <!-- <span class="fas fa-calendar-day mx-1"></span> -->
-                <span class="fas fa-clock mx-1"></span>
-                <strong>
-                {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'dddd')}
-                </strong>
-                {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_iso')}
-                at
-                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')}</strong>
-                <!-- {event_file_obj.updated_on} -->
-             {:else}
-                <!-- <span class="fas fa-calendar-day mx-1"></span> -->
-                <strong>
-                {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_short')}
-                <!-- at -->
-                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')}</strong>
-                </strong>
-            {/if}
-        </span>
-
-        </div>
-    </td>
-</tr>
-{/each}
-
-    </tbody>
-</table>
-</div>
-
-{:else}
-
-<p
-    class="w-96 text-center text-gray-500"
-    class:hidden={display_mode != 'default'}
-    >
-    No files uploaded to display
-</p>
-
-{/if}
-
-</section>
-
-
-<style>
-
-</style>
\ No newline at end of file
+<Element_manage_event_file_li
+    link_to_type={link_to_type}
+    link_to_id={link_to_id}
+    lq__event_file_obj_li={lq__event_file_obj_li}
+    allow_basic={allow_basic}
+    allow_moderator={allow_moderator}
+    container_class_li={container_class_li}
+    display_mode={display_mode}
+    />
diff --git a/src/lib/element_manage_event_file_li_direct.svelte b/src/lib/element_manage_event_file_li_direct.svelte
index f2cba50b..f9228bbc 100644
--- a/src/lib/element_manage_event_file_li_direct.svelte
+++ b/src/lib/element_manage_event_file_li_direct.svelte
@@ -1,19 +1,20 @@
 <script lang="ts">
 import { onMount } from 'svelte';
-import { clipboard } from '@skeletonlabs/skeleton';
+// import { clipboard } from '@skeletonlabs/skeleton';
 import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
-import { api } from '$lib/api';
+// import { ae_util } from '$lib/ae_utils';
+// import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store.svelte';
+import Element_manage_event_file_li from '$lib/element_manage_event_file_li.svelte';
 
 // import { core_func } from '$lib/ae_core_functions';
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { db_events } from "$lib/db_events";
-import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
-import { events_func } from '$lib/ae_events_functions';
+// import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
+// import { events_func } from '$lib/ae_events_functions';
 
 export let container_class_li: string|Array<string> = [];
 export let link_to_type: string;
@@ -25,7 +26,7 @@ export let display_mode: string = 'default'; // 'default', 'compact', 'minimal',
 // export let show_convert_btn: null|boolean = null;
 
 // let ae_placeholder_li: key_val = {};
-let ae_promises: key_val = {};
+// let ae_promises: key_val = {};
 let ae_tmp: key_val = {};
 ae_tmp.show__file_li = true;
 ae_tmp.show__direct_download = false;
@@ -52,528 +53,13 @@ onMount(() => {
 });
 </script>
 
-<span
-    class="float-right"
-    >
-    <button
-        type="button"
-        on:click={() => {
-            console.log('*** Refresh button clicked ***');
 
-            db_events.files.clear();
-
-            let params = {
-                qry__enabled: 'all',
-                qry__hidden: 'all',
-            }
-
-            events_func.handle_load_ae_obj_li__event_file({
-                api_cfg: $ae_api,
-                for_obj_type: link_to_type,
-                for_obj_id: link_to_id,
-                params: params,
-                try_cache: true
-            });
-
-            // ae_tmp.show__file_li = false;
-            // console.log(`$lq__event_file_obj_li:`, $lq__event_file_obj_li);
-            // $slct_trigger = 'load__event_file_obj_li';
-            // ae_tmp.show__file_li = true;
-        }}
-        class="btn btn-sm p-1 m-1 variant-soft-tertiary hover:variant-ghost-warning transition hover:transition-all *:hover:inline"
-        class:hidden={!$ae_loc.authenticated_access}
-        title="Refresh the list of files"
-        >
-        <span class="fas fa-sync-alt mx-1"></span>
-        <div class="hidden">
-        Files
-        </div>
-    </button>
-
-    <button
-        type="button"
-        on:click={() => {
-            console.log('*** Show Alt Download button clicked ***');
-            ae_tmp.show__direct_download = !ae_tmp.show__direct_download;
-        }}
-        class="btn btn-sm p-1 m-1 variant-soft-tertiary hover:variant-ghost-warning transition hover:transition-all *:hover:inline"
-        class:hidden={!$ae_loc.trusted_access}
-        title="Toggle direct download link and copy link button"
-        >
-        <span class="fas fa-download mx-1"></span>
-        <div class="hidden">
-        {ae_tmp.show__direct_download ? 'Alt On' : 'Alt Download Off'}
-        </div>
-    </button>
-</span>
-
-<section class="svelte_component event_file_uploaded_manage {container_class_li}"
-    class:text-sm={display_mode != 'default'}
-    >
-
-
-<h3
-    class="h6"
-    class:hidden={!$lq__event_file_obj_li?.length || display_mode != 'default'}
-    >
-    Manage Files:
-    <span class="font-bold bg-success-100 px-4 border rounded-lg border-success-200"
-        title="Files for {link_to_type ?? '-- not set --'}: {link_to_id ?? '-- not set --'} (files: {$lq__event_file_obj_li?.length ?? 'None'})"
-        >
-        <span class="fas fa-folder-open mx-1"></span>
-        {$lq__event_file_obj_li ? `${$lq__event_file_obj_li.length}x` : '-- none --'}
-    </span>
-</h3>
-
-{#if $lq__event_file_obj_li && $lq__event_file_obj_li.length}
-<div class="overflow-auto w-full">
-<table class="table-auto w-full">
-
-    {#if display_mode === 'default'}
-    <thead>
-        <tr>
-            <th class="text-center">Download File</th>
-            {#if display_mode === 'default'}
-            <th
-                class="text-center"
-                class:hidden={!allow_basic && !$ae_loc.trusted_access}
-                >Options</th>
-            {/if}
-            {#if display_mode === 'default'}
-            <th
-                class="text-center"
-                class:hidden={!allow_basic && !$ae_loc.trusted_access}
-                >Status</th>
-            {/if}
-            <th class="text-center">Meta</th>
-        </tr>
-    </thead>
-    {/if}
-
-    <tbody>
-
-{#each $lq__event_file_obj_li as event_file_obj}
-<tr
-    class="ae_obj obj_event_file border-t border-b border-gray-200 hover:bg-gray-50 hover:border-gray-300"
-    class:dim={event_file_obj?.hide}
-    >
-    <td class="event_file__file align-middle">
-        {#if $events_sess.pres_mgmt?.show_field_edit__filename != event_file_obj.event_file_id_random}
-        <button
-            disabled={!allow_basic && !allow_moderator && !$ae_loc.trusted_access}
-            on:click={() => {
-                // ae_promises[event_file_obj.event_file_id_random]
-                ae_promises[event_file_obj.event_file_id_random] = api.download_hosted_file({
-                    api_cfg: $ae_api,
-                    hosted_file_id: event_file_obj.hosted_file_id_random,
-                    return_file: true,
-                    filename: event_file_obj.filename,
-                    auto_download: true,
-                    log_lvl: 0
-                });
-
-                // window.postMessage({ type: 'download_event_file', event_file_id: event_file_obj.event_file_id_random, filename: event_file_obj.filename, auto_download: true }, '*');
-            }}
-            class="btn btn-sm lg:btn-md variant-soft-primary hover:variant-filled-primary min-w-72 lg:min-w-96"
-            title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
-            >
-            {#await ae_promises[event_file_obj.event_file_id_random]}
-                <span class="fas fa-spinner fa-spin mx-1"></span>
-                <span class="">
-                    Downloading
-                    {#if $ae_sess.api_download_kv[event_file_obj.hosted_file_id_random]}
-                        {$ae_sess.api_download_kv[event_file_obj.hosted_file_id_random].percent_completed}%
-                    {/if}
-                    :
-                </span>
-            {:then}
-                <!-- <span class="fas fa-download mx-1"></span> -->
-                <span class="fas fa-{ae_util.file_extension_icon(event_file_obj.extension)}"></span>
-                <!-- <span class="text-sm">
-                Download:
-                </span> -->
-            {/await}
-
-            <span class="grow">
-            {ae_util.shorten_filename({filename: event_file_obj.filename, max_length: 30})}
-            </span>
-
-            <span
-                class="badge variant-glass-success hover:variant-filled-success text-sm"
-                class:hidden={!event_file_obj.file_purpose}
-                >
-                {event_file_obj.file_purpose}
-            </span>
-        </button>
-        <a
-            href="{$ae_api.base_url}/event/file/{event_file_obj.event_file_id_random}/download?filename={event_file_obj.filename}&x_no_account_id_token=direct-download"
-            class="btn btn-sm variant-soft-secondary m-0.5 *:hover:inline"
-            class:hidden={!ae_tmp.show__direct_download}
-            title={`Download this file:\n${event_file_obj.filename}\n[API] SHA256: ${event_file_obj.hash_sha256.slice(0, 10)}... Hosted ID: ${event_file_obj.hosted_file_id_random} Event File ID: ${event_file_obj.event_file_id_random}`}
-            >
-            <span class="fas fa-download mx-1"></span>
-            <div class="hidden">
-            Download
-            </div>
-        </a>
-        <button
-            type="button"
-            use:clipboard={encodeURI(`${$ae_api.base_url}/event/file/${event_file_obj.event_file_id_random}/download?filename=${event_file_obj.filename}&x_no_account_id_token=direct-download`)}
-            class="btn btn-sm variant-soft-secondary m-0.5 *:hover:inline"
-            class:hidden={!ae_tmp.show__direct_download}
-            title="Copy the direct download file link to the clipboard."
-            >
-            <span class="fas fa-copy mx-1"></span>
-            <div class="hidden">
-            Copy Link
-            </div>
-        </button>
-        {:else}
-        <!-- Show change filename input field here -->
-         <span
-            class="flex flex-col gap-1 text-sm"
-            >
-            <input
-                type="text"
-                size="12"
-                placeholder="Filename"
-                bind:value="{$events_sess.pres_mgmt.tmp_val__filename_no_ext}"
-                data-original_value="{event_file_obj.filename}"
-                class="input min-w-72 lg:min-w-96 text-sm bg-warning-100"
-                title="Rename this file. No extension."
-                >
-            {#if $events_sess.pres_mgmt.tmp_val__filename_no_ext.trim() != event_file_obj.filename_no_ext}
-            <button
-                on:click={async () => {
-                    let new_filename = $events_sess.pres_mgmt.tmp_val__filename_no_ext.trim()
-                    // Remove possible double extension
-                    new_filename = new_filename.replace('.'+event_file_obj.extension, '');
-
-                    // Add the extension back
-                    new_filename = new_filename + '.' + event_file_obj.extension;
-
-                    // Remove any double dots
-                    new_filename = new_filename.replace(/\.\./g, '.');
-
-                    let event_file_data = {
-                        filename: new_filename,
-                    };
-
-                    ae_promises.update__event_file_obj = events_func.handle_update_ae_obj__event_file({
-                        api_cfg: $ae_api,
-                        event_file_id: event_file_obj.event_file_id_random,
-                        data_kv: event_file_data,
-                        log_lvl: 0
-                    })
-                    .then (function (update_results) {
-                        console.log(`Update results:`, update_results);
-                        $events_sess.pres_mgmt.show_field_edit__filename = false;
-                    });
-                }}
-                class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
-                title="Save changes"
-                >
-                {#await ae_promises.update__event_file_obj}
-                    <span class="fas fa-spinner fa-spin mx-1"></span>
-                    <span class="">Saving {event_file_obj.extension}</span>
-                {:then}
-                    <span class="fas fa-save mx-1"></span>
-                    Save {event_file_obj.extension} filename?
-                {/await}
-            </button>
-            {/if}
-        </span>
-        {/if}
-
-    </td>
-
-    {#if display_mode === 'default'}
-    <td
-        class="event_file__options"
-        class:hidden={!allow_basic && !$ae_loc.trusted_access}
-        >
-        <div class="flex flex-col gap-1 text-sm">
-        <button
-            disabled={!allow_basic && !$ae_loc.trusted_access}
-            on:click={() => {
-                if ($events_sess.pres_mgmt.show_field_edit__filename == event_file_obj.event_file_id_random) {
-                    $events_sess.pres_mgmt.tmp_val__filename_no_ext = '';
-                    $events_sess.pres_mgmt.show_field_edit__filename = false;
-                } else {
-                    $events_sess.pres_mgmt.tmp_val__filename_no_ext = event_file_obj.filename_no_ext;
-                    $events_sess.pres_mgmt.show_field_edit__filename = event_file_obj.event_file_id_random;
-                }
-            }}
-            class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
-            class:variant-glass-warning={$events_sess.pres_mgmt.show_field_edit__filename == event_file_obj.event_file_id_random}
-            title={`Rename this file? "${event_file_obj.filename}"`}
-            >
-            <span class="fas fa-edit mx-1"></span>
-            {#if $events_sess.pres_mgmt?.show_field_edit__filename == event_file_obj.event_file_id_random}
-                Cancel?
-            {:else}
-                Rename
-            {/if}
-        </button>
-
-        <button
-            disabled={!allow_basic && !$ae_loc.trusted_access}
-            on:click={async () => {
-                let event_file_data = {
-                    hide: !event_file_obj.hide,
-                };
-
-                ae_promises.update__event_file_obj = events_func.handle_update_ae_obj__event_file({
-                    api_cfg: $ae_api,
-                    event_file_id: event_file_obj.event_file_id_random,
-                    data_kv: event_file_data,
-                    log_lvl: 1
-                })
-                .then (function (update_results) {
-                    console.log(`Update results:`, update_results);
-
-                    let params = {
-                        qry__enabled: 'all',
-                        qry__hidden: 'all',
-                    }
-
-                    events_func.handle_load_ae_obj_li__event_file({
-                        api_cfg: $ae_api,
-                        for_obj_type: link_to_type,
-                        for_obj_id: link_to_id,
-                        params: params,
-                        try_cache: true
-                    });
-                });
-            }}
-            class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
-            title="Hide this file from the presentation launcher"
-            >
-
-            <!-- Users see this as the "Archive" option button -->
-            <!-- {@html (event_file_obj?.hide ? '<span class="fas fa-archive m-1"></span> Unarchive' : '<span class="fas fa-archive m-1"></span> Archive')} -->
-
-            {#await ae_promises.update__event_file_obj}
-                <span class="fas fa-spinner fa-spin mx-1"></span>
-                <span class="">Saving {event_file_obj.extension}</span>
-            {:then}
-                {#if event_file_obj.hide}
-                <span class="fas fa-eye m-1"></span> Unhide File
-                {:else}
-                <span class="fas fa-eye-slash m-1"></span> Hide
-                {/if}
-
-                <!-- {@html (event_file_obj?.hide ? '<span class="fas fa-eye m-1"></span> Unhide?' : '<span class="fas fa-eye-slash m-1"></span> Hide?')} -->
-                <!-- <span class="fas fa-save mx-1"></span>
-                Save {event_file_obj.extension} filename? -->
-            {/await}
-        </button>
-
-
-
-        <button
-            disabled={!allow_basic && !$ae_loc.trusted_access}
-            on:click={async () => {
-                if (!confirm(`Are you sure you want to delete this file?\n${event_file_obj.filename} [${event_file_obj.event_file_id_random}]`)) {return false;}
-
-                // ae_promises[event_file_obj.event_file_id_random] = handle_delete__event_file({event_file_id: event_file_obj.event_file_id_random});
-
-                ae_promises.delete__event_file_obj = await events_func.handle_delete_ae_obj_id__event_file({
-                    api_cfg: $ae_api,
-                    event_file_id: event_file_obj.event_file_id_random,
-                    log_lvl: 1
-                })
-            }}
-            class="btn btn-sm variant-glass-tertiary hover:variant-soft-success"
-            title="Delete this file"
-            >
-            <span class="fas fa-trash-alt mx-1"></span>
-            <!-- <span class="fas fa-minus mx-1"></span> -->
-            Delete
-        </button>
-        </div>
-    </td>
-    {/if}
-
-    {#if display_mode === 'default'}
-    <td
-        class="event_file__status"
-        class:hidden={!allow_basic && !$ae_loc.trusted_access}
-        >
-        <div class="flex flex-col gap-1 items-center text-sm">
-
-        <div class="">
-            {#if event_file_obj.open_in_os == 'win'}
-
-                MS Windows <span class="fab fa-windows"></span>
-
-            {:else if event_file_obj.open_in_os == 'mac'}
-
-                Apple macOS <span class="fab fa-apple"></span>
-
-            {/if}
-        </div>
-
-        <!-- Select from options for the purpose of this file -->
-        <div>
-            <label
-                for="file_purpose"
-                class="text-sm mx-1 hidden"
-                >
-                Purpose:
-            </label>
-            <select
-                id="file_purpose"
-                name="file_purpose"
-                disabled={!allow_basic && !allow_moderator && !$ae_loc.trusted_access}
-                value={event_file_obj.file_purpose}
-                on:change={e => {
-                    // ae_tmp[event_file_obj.event_file_id_random].file_purpose = e.target.value;
-                    console.log(`Selected file_purpose: ${e.target.value}`);
-
-                    let event_file_data = {
-                        event_file_id_random: event_file_obj.event_file_id_random,
-                        file_purpose: e.target.value,
-                    };
-
-                    events_func.handle_update_ae_obj__event_file({
-                            api_cfg: $ae_api,
-                            event_file_id: event_file_obj.event_file_id_random,
-                            data_kv: event_file_data,
-                            log_lvl: 1
-                    })
-                    .then (function (update_results) {
-                        console.log(`Update results:`, update_results);
-                        $slct_trigger = 'load__event_file_obj_li';
-                    });
-
-
-
-                    // ae_triggers.update_event_file_purpose = true;
-                }}
-                class="select min-w-fit max-w-fit text-sm mx-1 border border-gray-300 rounded-md p-1 hover:border-gray-400"
-                >
-                <option value={null} selected={!event_file_obj.file_purpose} class="text-xs">-- purpose not set --</option>
-                <option value="outline" selected={event_file_obj.file_purpose === 'outline'}>1. Outline</option>
-                <option value="draft" selected={event_file_obj.file_purpose === 'draft'}>2. Draft</option>
-                <option value="final" selected={event_file_obj.file_purpose === 'final'}>3. Final</option>
-                <!-- <option value="supporting">X. Supporting File (audio, video, data, etc)</option> -->
-                <!-- <option value="handout">X. Handout</option> -->
-                <option value="other">X. Other</option>
-                <!-- <option value="poster">Final - Poster</option> -->
-                <!-- <option value="presentation">Final - Presentation</option> -->
-                <!-- Shows in session room -->
-            </select>
-        </div>
-
-        </div>
-
-    </td>
-    {/if}
-
-    <td class="event_file_info file_meta text-gray-500">
-        <div
-            class="flex flex-col gap-0.5 text-xs"
-
-            >
-        <!-- {event_file_obj.hosted_file_content_type} -->
-
-        <span class="w-full flex flex-col lg:flex-row justify-between">
-        <span
-            class:hidden={display_mode != 'default'}
-            >
-            Type:
-            <strong>{event_file_obj.extension} <span class="fas fa-{ae_util.file_extension_icon(event_file_obj.extension)}"></span>
-            </strong>
-            <!-- {#if event_file_obj.open_in_os == 'win'}
-                <strong>
-                MS Windows <span class="fab fa-windows"></span>
-                </strong>
-            {:else if event_file_obj.open_in_os == 'mac'}
-                <strong>
-                Apple macOS <span class="fab fa-apple"></span>
-                </strong>
-            {/if} -->
-
-        </span>
-        <span>
-            <span
-                class:hidden={display_mode != 'default'}
-                >
-                Size:
-            </span>
-            <strong>{ae_util.format_bytes(event_file_obj.file_size)}</strong>
-        </span>
-        </span>
-
-        <span class="w-full flex flex-col lg:flex-row justify-between">
-        <span title="SHA 256: {event_file_obj.hash_sha256}">
-            <span
-                class:hidden={display_mode != 'default'}
-                >
-                Hash:
-            </span>
-            <strong
-                class:font-normal={display_mode != 'default'}
-                >{event_file_obj.hash_sha256.slice(0, 10)}&mldr;</strong>
-        </span>
-        <span
-            class:hidden={!$ae_loc.administrator_access || display_mode != 'default'}>
-            <span
-                class:hidden={display_mode != 'default'}
-                >
-                ID:
-            </span>
-            <strong>{event_file_obj.hosted_file_id_random}</strong>
-        </span>
-        </span>
-
-        <span>
-            {#if display_mode == 'default'}
-                <!-- <span class="fas fa-cloud-upload-alt mx-1"></span> -->
-                <!-- Uploaded: -->
-                <!-- <span class="fas fa-calendar-day mx-1"></span> -->
-                <span class="fas fa-clock mx-1"></span>
-                <strong>
-                {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'dddd')}
-                </strong>
-                {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_iso')}
-                at
-                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')}</strong>
-                <!-- {event_file_obj.updated_on} -->
-             {:else}
-                <!-- <span class="fas fa-calendar-day mx-1"></span> -->
-                <strong>
-                {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_short')}
-                <!-- at -->
-                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')}</strong>
-                </strong>
-            {/if}
-        </span>
-
-        </div>
-    </td>
-</tr>
-{/each}
-
-    </tbody>
-</table>
-</div>
-
-{:else}
-
-<p
-    class="w-96 text-center text-gray-500"
-    class:hidden={display_mode != 'default'}
-    >
-    No files uploaded to display
-</p>
-
-{/if}
-
-</section>
-
-
-<style>
-
-</style>
\ No newline at end of file
+<Element_manage_event_file_li
+    link_to_type={link_to_type}
+    link_to_id={link_to_id}
+    lq__event_file_obj_li={lq__event_file_obj_li}
+    allow_basic={allow_basic}
+    allow_moderator={allow_moderator}
+    container_class_li={container_class_li}
+    display_mode={display_mode}
+    />
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte
index 83ba8ebe..2b05c5cf 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte
@@ -4,7 +4,7 @@ import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import { liveQuery } from "dexie";
-import { core_func } from '$lib/ae_core_functions';
+// import { core_func } from '$lib/ae_core_functions';
 import { db_events } from "$lib/db_events";
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
@@ -12,10 +12,10 @@ import { events_func } from '$lib/ae_events_functions';
 
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Comp_event_presenter_obj_li from './ae_comp__event_presenter_obj_li.svelte';
-import Element_manage_event_file_li from '$lib/element_manage_event_file_li_all.svelte';
+import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_all.svelte';
 
 // Exports
-// export let container_class_li: string|Array<string> = [];
+export let container_class_li: string|Array<string> = [];
 export let lq__event_obj: any;
 export let lq__event_presentation_obj_li: any;
 // It is important that these not be set to a value! It messes with the Dexie LiveQuery.
@@ -81,40 +81,46 @@ let lq_fancy__event_presentation_obj_li = liveQuery(
 </script>
 
 
-<div class="float-right space-2 flex flex-row items-center">
-{#if $ae_loc.trusted_access && $ae_loc.edit_mode}
-<button
-    type="button"
-    on:click={() => {
-        console.log('Add Presentation');
-        if (!confirm('Add a new presentation to the session? You will be able to edit the details after the presentation is created.')) {
-            return;
-        }
-
-        let presentation_data = {
-            event_id_random: $events_slct.event_id,
-            event_session_id_random: $events_slct.event_session_id,
-            name: 'TEMP Presentation Name',
-            code: 'new_presentation',
-            enable: true,
-        }
-
-        events_func.create_ae_obj__event_presentation({
-            api_cfg: $ae_api,
-            event_id: $events_slct.event_id,
-            event_session_id: $events_slct.event_session_id,
-            data_kv: presentation_data,
-            log_lvl: 1,
-        })
-    }}
-    class="btn btn-sm variant-soft-warning hover:variant-filled-warning"
+<div
+    class="float-right flex flex-row items-center"
     >
-    <span class="fas fa-plus mx-1"></span>
-    Add Presentation
-</button>
-{/if}
+    {#if $ae_loc.trusted_access && $ae_loc.edit_mode}
+    <button
+        type="button"
+        on:click={() => {
+            console.log('Add Presentation');
+            if (!confirm('Add a new presentation to the session? You will be able to edit the details after the presentation is created.')) {
+                return;
+            }
+
+            let presentation_data = {
+                event_id_random: $events_slct.event_id,
+                event_session_id_random: $events_slct.event_session_id,
+                name: 'TEMP Presentation Name',
+                code: 'new_presentation',
+                enable: true,
+            }
+
+            events_func.create_ae_obj__event_presentation({
+                api_cfg: $ae_api,
+                event_id: $events_slct.event_id,
+                event_session_id: $events_slct.event_session_id,
+                data_kv: presentation_data,
+                log_lvl: 1,
+            })
+        }}
+        class="btn btn-sm variant-soft-warning hover:variant-filled-warning"
+        >
+        <span class="fas fa-plus mx-1"></span>
+        Add Presentation
+    </button>
+    {/if}
 </div>
 
+
+<section class="ae_comp event_presentation_obj_li {container_class_li}">
+
+
 <h3 class="h5">Presentations:
     <span class="font-bold bg-success-100 px-4 border rounded-lg border-success-200"
         class:hidden={$lq__event_presentation_obj_li?.length <= 1}
@@ -336,7 +342,7 @@ Loading...
 
 
         <!-- Show files for this presentation -->
-        <Element_manage_event_file_li
+        <Element_manage_event_file_li_wrap
             link_to_type={'event_presentation'}
             link_to_id={event_presentation_obj?.event_presentation_id_random}
             allow_basic={$events_loc.auth__kv.session[$events_slct.event_session_id] || $events_loc.auth__kv.presenter[$events_slct.event_presenter_id]}
@@ -351,4 +357,8 @@ Loading...
     Nothing to show yet...!
 {/if}
 
+
+</section>
+
+
 <!-- {/await} -->
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
index 3ed32ea9..22dc9593 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
@@ -129,30 +129,34 @@ onMount(() => {
 
 </script>
 
-<button
-    type="button"
-    on:click={() => {
-        console.log('*** Refresh button clicked ***');
-        ae_tmp.show__file_li = false;
-        console.log(`$lq__event_presenter_obj_li:`, $lq__event_presenter_obj_li);
-        // $slct_trigger = 'load__event_presenter_obj_li';
 
-        // if (link_to_type == 'event_presentation') {
+<div
+    class="float-right flex flex-row items-center"
+    >
+    <button
+        type="button"
+        on:click={() => {
+            console.log('*** Refresh button clicked ***');
+            ae_tmp.show__file_li = false;
+            console.log(`$lq__event_presenter_obj_li:`, $lq__event_presenter_obj_li);
             events_func.load_ae_obj_li__event_presenter({
                 api_cfg: $ae_api,
                 for_obj_type: link_to_type,
                 for_obj_id: link_to_id,
                 log_lvl: 1,
             });
-        // }
-    }}
-    class="btn btn-sm p-1 m-1 variant-soft-tertiary hover:variant-ghost-warning float-right transition hover:transition-all"
-    class:hidden={!$ae_loc.trusted_access || display_mode != 'default'}
-    title="Refresh the list of presenters"
-    >
-    <span class="fas fa-sync-alt mx-1"></span>
-    Presenters
-</button>
+        }}
+        class="btn btn-sm p-1 m-1 variant-soft-tertiary hover:variant-ghost-warning transition hover:transition-all *:hover:inline"
+        class:hidden={!$ae_loc.trusted_access || display_mode != 'default'}
+        title="Refresh the list of presenters"
+        >
+        <span class="fas fa-sync-alt m-1"></span>
+        <span class="hidden">
+        Presenters
+        </span>
+    </button>
+</div>
+
 
 <section class="ae_comp event_presenter_obj_li {container_class_li}">
 
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte
index df720070..a5f53f13 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte
@@ -23,6 +23,8 @@ export let container_class_li: string|Array<string> = [];
 export let link_to_type: string;
 export let link_to_id: string;
 export let event_session_id_random_li: Array<string> = ['']; // 'VSBH-19-41-50'
+export let hide__session_location: boolean = false;
+export let hide__session_poc: boolean = false;
 // export let allow_basic: boolean = false;
 // export let allow_moderator: boolean = false;
 
@@ -121,8 +123,12 @@ let lq_kv__event_session_obj_li = liveQuery(
         <th>Session</th>
         <th>Date</th>
         <th>Start/End</th>
-        <th>Location</th>
-        <th>POC</th>
+        <th
+            class:hidden={hide__session_location}
+            >Location</th>
+        <th
+            class:hidden={hide__session_poc}
+            >POC</th>
     </tr>
 </thead>
 <tbody>
@@ -208,7 +214,9 @@ let lq_kv__event_session_obj_li = liveQuery(
             {/if}
         </span>
     </td>
-    <td>
+    <td
+        class:hidden={hide__session_location}
+        >
         <!-- Minimum level access to see the link here is "trusted". -->
         {#if $ae_loc.manager_access || $ae_loc.trusted_access && $lq__event_obj?.mod_pres_mgmt_json?.show__launcher_link}
             <a
@@ -225,6 +233,7 @@ let lq_kv__event_session_obj_li = liveQuery(
             </span>
         {/if}
     <td
+        class:hidden={hide__session_poc}
         >
         <span class="flex flex-col items-start lg:flex-row lg:items-center lg:justify-between">
         {#if session_obj?.poc_person_full_name}
diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
index ffb3d518..82d64dbe 100644
--- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
@@ -45,6 +45,21 @@ let lq__event_obj = liveQuery(
     () => db_events.events.get($events_slct.event_id)
 );
 
+$: if ($lq__event_obj?.mod_pres_mgmt_json) {
+    $events_loc.pres_mgmt.label__presenter_external_id = $lq__event_obj?.mod_pres_mgmt_json?.label__presenter_external_id ?? 'External ID';
+    $events_loc.pres_mgmt.label__session_poc_name = $lq__event_obj?.mod_pres_mgmt_json?.label__session_poc_name ?? 'Point of Contact';
+    $events_loc.pres_mgmt.hide__presenter_biography = $lq__event_obj?.mod_pres_mgmt_json?.hide__presenter_biography ?? false;
+    $events_loc.pres_mgmt.hide__session_code = $lq__event_obj?.mod_pres_mgmt_json?.hide__session_code ?? false;
+    $events_loc.pres_mgmt.hide__session_description = $lq__event_obj?.mod_pres_mgmt_json?.hide__session_description ?? false;
+    $events_loc.pres_mgmt.hide__session_location = $lq__event_obj?.mod_pres_mgmt_json?.hide__session_location ?? false;
+    $events_loc.pres_mgmt.hide__session_poc = $lq__event_obj?.mod_pres_mgmt_json?.hide__session_poc ?? false;
+    $events_loc.pres_mgmt.limit__navigation = $lq__event_obj?.mod_pres_mgmt_json?.limit__navigation ?? false;
+    $events_loc.pres_mgmt.presenter__require_agree = $lq__event_obj?.mod_pres_mgmt_json?.presenter__require_agree ?? false;
+    $events_loc.pres_mgmt.show__email_access_link = $lq__event_obj?.mod_pres_mgmt_json?.show__email_access_link ?? false;
+    $events_loc.pres_mgmt.show__launcher_link = $lq__event_obj?.mod_pres_mgmt_json?.show__launcher_link ?? false;
+}
+
+
 // let event_obj_v2 = db_events.events.get($events_slct.event_id);
 
 // let lq__event_session_obj_li = liveQuery(
@@ -427,6 +442,7 @@ async function handle_search__event_session(
     link_to_type={'event'}
     link_to_id={$events_slct.event_id}
     event_session_id_random_li={event_session_id_random_li}
+    hide__session_poc={$events_loc.pres_mgmt.hide__session_poc}
     />
 </div>
 {:else}
diff --git a/src/routes/events_pres_mgmt/form_agree.svelte b/src/routes/events_pres_mgmt/form_agree.svelte
index e1f8c7f4..0eb70723 100644
--- a/src/routes/events_pres_mgmt/form_agree.svelte
+++ b/src/routes/events_pres_mgmt/form_agree.svelte
@@ -133,38 +133,9 @@ async function handle_update__event_presenter({
 
     return ae_promises.update__event_presenter_obj;
 }
-
-
-// function send_init_confirm_email() {
-//     console.log(`*** send_init_confirm_email() *** to ${$lq__event_presenter_obj.email}.`);
-
-//     let subject = `LCI 2024 Pres Mgmt Hub Link for ${$lq__event_session_obj.name} (ID: ${$lq__event_session_obj.event_session_id_random})`;
-
-//     let body_html = `
-//     <div>${$lq__event_session_obj.full_name},
-//     <p>The link to sign in to the presentation management hub for LCI 2024 is below. If you need to make any changes or updates to your submission, you may access it via via the link below.</p>
-//     </div>
-
-//     <br>
-
-//     <div>
-//     LCI 2024 Session ID: ${$lq__event_session_obj.event_session_id_random}<br>
-//     <p>Use this link to view or update your LCI 2024 presentation information.<br>
-//     Copy and paste link: <a href="xxx">xxxx</a></p>
-//     </div>`;
-
-//     api.send_email({
-//         api_cfg: $ae_api,
-//         from_email: 'noreply+presmgmt@oneskyit.com',
-//         from_name: 'LCI 2024 Pres Mgmt Hub',
-//         to_email: 'test+agree@oneskyit.com',
-//         subject: subject,
-//         body_html: body_html,
-//     });
-// }
-
 </script>
 
+
 <!-- {#await $lq__event_presenter_obj}
     Loading...
 {:then result} -->
diff --git a/src/routes/events_pres_mgmt/presenter_view.svelte b/src/routes/events_pres_mgmt/presenter_view.svelte
index b166932b..fddda8ab 100644
--- a/src/routes/events_pres_mgmt/presenter_view.svelte
+++ b/src/routes/events_pres_mgmt/presenter_view.svelte
@@ -514,7 +514,7 @@ $: if ($lq__event_presenter_obj) {
             }}
             >
             <span class="fas fa-id-card"></span>
-            {$lq__event_obj?.mod_pres_mgmt_json?.external_id_label ?? 'External ID'}:
+            {$lq__event_obj?.mod_pres_mgmt_json?.label__presenter_external_id ?? 'External ID'}:
             <span class="font-bold">
             {@html $lq__event_presenter_obj?.external_id ?? ae_snip.html__not_set}
             </span>
@@ -1350,7 +1350,7 @@ $: if ($lq__event_presenter_obj) {
 
     <!-- The presenters biography. There should be a character counter. -->
     <li
-        class:hidden={$lq__event_obj?.mod_pres_mgmt_json?.hide__presenter_bio}
+        class:hidden={$lq__event_obj?.mod_pres_mgmt_json?.hide__presenter_biography}
         >
         <div class="label event_presenter__biography required space-y-4">
             <button
diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
index 490cff12..9162ff81 100644
--- a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
@@ -26,7 +26,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv }
 import { events_func } from '$lib/ae_events_functions';
 
 import Comp_event_files_upload from './../../ae_comp__event_files_upload.svelte';
-import Element_manage_event_file_li from '$lib/element_manage_event_file_li_direct.svelte';
+import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_direct.svelte';
 import Session_view from './../../session_view.svelte';
 import Session_page_menu from './../../session_page_menu.svelte';
 // import Sign_in_out from './../../sign_in_out.svelte';
@@ -115,120 +115,7 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__session
 // Functions and Logic
 onMount(() => {
     console.log('Events Session [slug]: +page.svelte');
-
-    // console.log(`lq__auth__event_presenter_obj:`, $lq__auth__event_presenter_obj?.full_name);
-
-    // let url_person_id = data.url.searchParams.get('person_id');
-    // let url_person_pass = data.url.searchParams.get('person_pass');
-    // let url_presentation_id = data.url.searchParams.get('presentation_id');
-    // let url_presenter_id = data.url.searchParams.get('presenter_id');
-    // let url_session_id = data.url.searchParams.get('session_id');
-
-    // // This should be turned into a function to correctly authenticate the person and allow them access to their presentations and presenter details.
-    // if (url_person_pass) {
-    //     console.log(`ae_events_pres_mgmt session [slug] +page.svelte: event_session_id=${$events_slct.event_session_id}; person_id=${url_person_id}; person_pass=${url_person_pass}; presentation_id=${url_presentation_id}; presenter_id=${url_presenter_id}`);
-
-    //     // Using temporary session values first.
-    //     $events_sess.auth__entered_key = url_person_id;
-    //     $events_sess.auth__entered_passcode = url_person_pass;
-
-    //     $events_sess.auth__person.id = url_person_id;
-    //     $events_sess.auth__person.presentation_id = url_presentation_id;
-    //     $events_sess.auth__person.presenter_id = url_presenter_id;
-    //     $events_sess.auth__person.session_id = url_session_id; // For POC or LCI Champions for sessions. Do not set for a presenter!
-
-    //     $events_sess.auth__kv.person[url_person_id] = true;
-    //     $events_sess.auth__kv.session[$events_slct.event_session_id] = true; // For POC or LCI Champions for sessions. Do not set for a presenter!
-    //     $events_sess.auth__kv.presentation[url_presentation_id] = true;
-    //     $events_sess.auth__kv.presenter[url_presenter_id] = true;
-
-    //     // We need to set the selected presentation and presenter objects based on the respective IDs.
-    //     if (url_presentation_id && url_presenter_id) {
-    //         $events_slct.event_presentation_id = url_presentation_id;
-    //         $events_slct.event_presenter_id = url_presenter_id;
-    //     }
-
-    //     // console.log('Remove the passcode from the URL.');
-    //     // data.url.searchParams.delete('person_id');
-    //     // data.url.searchParams.delete('person_pass');
-    //     // data.url.searchParams.delete('presentation_id');
-    //     // data.url.searchParams.delete('presenter_id');
-    //     // data.url.searchParams.delete('session_id');
-
-    //     // let new_url = data.url.toString()
-    //     // console.log(new_url);
-    //     // goto(new_url, {replaceState: true});
-    //     if (url_presenter_id) {
-    //         presenter_sign_in();
-    //     }
-
-    //     if (url_session_id) {
-    //         session_sign_in();
-    //     }
-    // }
 });
-
-
-// function presenter_sign_in() {
-//     console.log('Presenter sign in with URL values');
-
-//     $ae_loc.authenticated_access = true;
-//     $ae_loc.access_type = 'authenticated';
-
-//     $events_loc.auth__person.id = $events_sess.auth__entered_key; // person_id
-//     $events_loc.auth__person.entered_key = $events_sess.auth__entered_key; // also person_id in this case
-//     $events_loc.auth__person.email = 'test@example.com';
-//     $events_loc.auth__person.full_name = 'Test Person';
-
-//     $events_loc.auth__kv.person[$events_sess.entered_key] = true;
-//     $events_loc.auth__kv.session[$events_slct.event_session_id] = false; // Set to false for presenters.
-//     $events_loc.auth__kv.presentation[$events_sess.auth__person.presentation_id] = true;
-//     $events_loc.auth__kv.presenter[$events_sess.auth__person.presenter_id] = true;
-
-//     // Setting again here... just because for now.
-//     $events_slct.event_presentation_id = $events_sess.auth__person.presentation_id;
-//     $events_slct.event_presenter_id = $events_sess.auth__person.presenter_id;
-// }
-
-// function session_sign_in() {
-//     console.log('Session sign in with URL values');
-
-//     $ae_loc.authenticated_access = true;
-//     $ae_loc.access_type = 'authenticated';
-
-//     $events_loc.auth__person.id = $events_sess.auth__entered_key; // person_id
-//     $events_loc.auth__person.entered_key = $events_sess.auth__entered_key; // also person_id in this case
-//     $events_loc.auth__person.email = 'test@example.com';
-//     $events_loc.auth__person.full_name = 'Test Person';
-
-//     $events_loc.auth__kv.person[$events_sess.entered_key] = true;
-//     $events_loc.auth__kv.session[$events_slct.event_session_id] = true;
-//     $events_loc.auth__kv.presentation[$events_sess.auth__person.presentation_id] = false; // Set to false for session POC (LCI Champions).
-//     $events_loc.auth__kv.presenter[$events_sess.auth__person.presenter_id] = false; // Set to false for session POC (LCI Champions).
-
-//     // Setting again here... just because for now.
-//     // $events_slct.event_presentation_id = $events_sess.auth__person.presentation_id;
-//     // $events_slct.event_presenter_id = $events_sess.auth__person.presenter_id;
-// }
-
-// function sign_out() {
-//     $ae_loc.authenticated_access = false;
-//     $ae_loc.access_type = 'anonymous';
-
-//     $events_loc.auth__person = {
-//         id: null,
-//         email: null,
-//         full_name: null,
-//         entered_key: null,
-//         entered_passcode: null,
-//     };
-//     $events_loc.auth__kv = {
-//         session: {},
-//         presentation: {},
-//         presenter: {},
-//         person: {},
-//     };
-// }
 </script>
 
 
@@ -285,7 +172,7 @@ onMount(() => {
             />
 
         <div class="overflow-x-auto w-max max-w-full">
-        <Element_manage_event_file_li
+        <Element_manage_event_file_li_wrap
             link_to_type={'event_session'}
             link_to_id={$lq__event_session_obj?.event_session_id_random}
             allow_basic={$events_loc.auth__kv.session[$lq__event_session_obj.event_session_id_random] || $events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id_random]}
diff --git a/src/routes/events_pres_mgmt/session_view.svelte b/src/routes/events_pres_mgmt/session_view.svelte
index c4f3917d..589a07ea 100644
--- a/src/routes/events_pres_mgmt/session_view.svelte
+++ b/src/routes/events_pres_mgmt/session_view.svelte
@@ -10,7 +10,7 @@ import { liveQuery } from "dexie";
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
-// import Element_data_store from '$lib/element_data_store.svelte';
+import Element_data_store from '$lib/element_data_store.svelte';
 
 let ae_promises: key_val = {};
 let ae_tmp: key_val = {};
@@ -24,8 +24,6 @@ import { events_func } from '$lib/ae_events_functions';
 
 import Form_agree from './form_agree.svelte';
 import Comp_event_presentation_obj_li from './ae_comp__event_presentation_obj_li.svelte';
-// import Comp_event_presenter_obj_li from './ae_comp__event_presenter_obj_li.svelte';
-// import Element_manage_event_file_li from '$lib/element_manage_event_file_li_all.svelte';
 
 
 // Exports
@@ -714,78 +712,48 @@ $: if ($lq__event_session_obj) {
     {/if}
 
     {#if $ae_loc.trusted_access || $events_loc.auth__kv.session[$events_slct.event_session_id] || ($events_loc.auth__kv.presenter[$events_slct.event_presenter_id] &&  $lq__event_presenter_obj?.agree)}
-
-    <div class="min-w-max flex flex-col gap-1">
-
-    <!-- The account_id should not be hardcoded! -->
-    {#if $lq__event_session_obj?.account_id_random == 'xFP7AhU8Zlc'}
-    <!-- This styling took a while and finally looks good on most sized screens. -->
-    <a
-        class="btn btn-md variant-ghost-primary hover:variant-filled-primary flex flex-row items-center justify-between max-w-xs md:max-w-full text-wrap md:text-nowrap"
-        href="https://static.oneskyit.com/c/LCI/files/LCI_Congress_Template_2024.pptx"
-        >
-        <span class="fas fa-download mx-1"></span>
-        <!-- This is subtle but helps with the button layout. -->
-        <span class="text-center grow">
-        <span class="text-sm">Download</span><br>
-        LCI Congress Template 2024 (PowerPoint)
-        </span>
-    </a>
-    <a
-        class="btn btn-md variant-ghost-primary hover:variant-filled-primary flex flex-row items-center justify-between max-w-xs md:max-w-full text-wrap md:text-nowrap"
-        href="https://static.oneskyit.com/c/LCI/files/LCI_Speaker_and_Champion_Congress_Task_List_2024.xlsx"
-        >
-        <span class="fas fa-download mx-1"></span>
-        <!-- This is subtle but helps with the button layout. -->
-        <span class="text-center grow wrap">
-        <span class="text-sm">Download</span><br>
-        LCI Speaker and Champion Congress Task List (Excel)
-        </span>
-    </a>
+        <!-- Message if they have agreed -->
+        <Element_data_store
+            ds_code="events__pres_mgmt__session_page_authorized_info"
+            ds_name="Default: Events - Pres Mgmt Session Authorized Info"
+            ds_type="html"
+            for_type="event"
+            for_id={$lq__event_presenter_obj?.event_id_random}
+            class_li="w-fit max-w-screen-lg flex flex-col gap-1"
+            show_edit={false}
+            show_edit_btn={true}
+            />
     {:else}
-    <p>Please select your name below to upload presentation files.</p>
+        <!-- Message if they have not yet agreed -->
+        <Element_data_store
+            ds_code="events__pres_mgmt__presenter_agree_read_consent"
+            ds_name="Default: Events - Pres Mgmt Session Restricted Access"
+            ds_type="html"
+            for_type="event"
+            for_id={$lq__event_presenter_obj?.event_id_random}
+            class_li="w-fit max-w-screen-lg text-lg text-red-500 font-bold text-center p-1 m-1 border border-red-200 rounded-md bg-red-100 space-y-2"
+            show_edit={false}
+            show_edit_btn={true}
+            />
     {/if}
-    </div>
-
-    {:else}
-    <span class="text-lg text-red-500 font-bold text-center p-1 m-1 border border-red-200 rounded-md bg-red-100 space-y-2">
-        <p><strong>Read and Consent Agreement?</strong></p>
-
-        <p>Please select your name below to view, read, and consent the agreement.</p>
-
-        <p>You will be able to download the LCI Congress Template 2024 (PowerPoint) and LCI Speaker and Champion Congress Task List (Excel) after you have read and consented to the agreement.</p>
-        </span>
-    {/if}
-
-    <!-- {#if $events_loc.auth__person?.id}
-    <button
-        type="button"
-        class="btn btn-sm variant-soft-warning hover:variant-ghost-warning"
-        on:click={() => {
-            sign_out();
-            alert('You have been signed out.');
-        }}
-        >
-        <span class="fas fa-times mx-1"></span>
-        Sign Out (Clear Session)
-    </button>
-    {/if} -->
 
 {:else}
 
-    <div
-        class="text-xl text-red-500 font-bold text-center p-1 m-1 border border-red-200 rounded-md bg-red-100"
-        >
-        <p><strong>Restricted access!</strong></p>
-        <p>
-            Please select your name below to email the access link.
-            The email address associated with your LCI member record will be used.
-            The email address is not shown below for safety reasons.
-            <!-- This email address must match your LCI member record. -->
-        </p>
-    </div>
+    <Element_data_store
+        ds_code="events__pres_mgmt__session_page_restricted_access"
+        ds_name="Default: Events - Pres Mgmt Session Restricted Access"
+        ds_type="html"
+        for_type="event"
+        for_id={$lq__event_presenter_obj?.event_id_random}
+        class_li="w-fit max-w-screen-lg text-xl text-red-500 font-bold text-center p-1 m-1 border border-red-200 rounded-md bg-red-100"
+        show_edit={false}
+        show_edit_btn={true}
+        />
 
 {/if}
+
+
+
 </div>
 
 </section>
@@ -793,6 +761,7 @@ $: if ($lq__event_session_obj) {
 
 <!-- Presentations in the session -->
 <section>
+
     {#await $lq__event_presentation_obj_li}
     Loading....
     {:then event_presentation_obj_li}
@@ -807,7 +776,6 @@ $: if ($lq__event_session_obj) {
     {/if}
     {/await}
 
-
 </section>
 
 {/if}