diff --git a/src/components/custom/edit/dataset/DatasetType.jsx b/src/components/custom/edit/dataset/DatasetType.jsx
index 2e3189143..3ee767c56 100644
--- a/src/components/custom/edit/dataset/DatasetType.jsx
+++ b/src/components/custom/edit/dataset/DatasetType.jsx
@@ -3,16 +3,17 @@ import {Col, Form, Row} from 'react-bootstrap';
 import SenNetPopover from "../../../SenNetPopover";
 import {getUBKGFullName} from "../../js/functions";
 
-export default function DatasetType({datasetTypes, data, onChange}) {
+export default function DatasetType({datasetTypes, data, label, labelDescription, dataValue, onChange}) {
 
+    console.log(datasetTypes)
     return (
         //Data Types
         <>
             <Form.Group className="mb-3" controlId="dataset_type">
-                <Form.Label>Dataset Type <span
+                <Form.Label>{label ? label : `Dataset Type` }<span
                     className="required">* </span>
                     <SenNetPopover className={'dataset_type'}
-                                   text={<>The type of data contained in this <code>Dataset</code>. Choose from one
+                                   text={labelDescription ? labelDescription : <>The type of data contained in this <code>Dataset</code>. Choose from one
                                        of the available options.</>}>
                         <i className={'bi bi-question-circle-fill'}></i>
                     </SenNetPopover>
@@ -23,13 +24,13 @@ export default function DatasetType({datasetTypes, data, onChange}) {
                     (
                         <Form.Select required aria-label="Dataset Type" disabled>
                             <option
-                                value={data.dataset_type}>{getUBKGFullName(data.dataset_type)}</option>
+                                value={data.dataset_type}>{getUBKGFullName(dataValue ? data[dataValue] : data.dataset_type)}</option>
                         </Form.Select>
                     ) : (
                         <Form.Select required aria-label="Dataset Type"
-                                     onChange={(e) => onChange(e, 'dataset_type', e.target.value)}
-                                     name={'dataset_type'}
-                                     defaultValue={data?.dataset_type}>
+                                     onChange={(e) => onChange(e, dataValue ? dataValue : 'dataset_type', e.target.value)}
+                                     name={dataValue ? dataValue : 'dataset_type'}
+                                     defaultValue={dataValue ? data?.[dataValue] : data?.dataset_type}>
                             <option value="">----</option>
                             {datasetTypes.map(data_type => {
                                 return (
diff --git a/src/pages/edit/dataset.jsx b/src/pages/edit/dataset.jsx
index e7b479628..d76b8c0d4 100644
--- a/src/pages/edit/dataset.jsx
+++ b/src/pages/edit/dataset.jsx
@@ -533,7 +533,7 @@ export default function EditDataset() {
                                         </Form.Group>
                                     }
 
-                                    {/*/!*Data Types*!/*/}
+                                    {/*/!*Dataset Type*!/*/}
                                     {editMode &&
                                         <DatasetType
                                             datasetTypes={dataTypes === null ? Object.values(cache.datasetTypes) : dataTypes}
diff --git a/src/pages/edit/upload.jsx b/src/pages/edit/upload.jsx
index fe3a1c1cd..5257b5497 100644
--- a/src/pages/edit/upload.jsx
+++ b/src/pages/edit/upload.jsx
@@ -6,22 +6,23 @@ import Button from 'react-bootstrap/Button';
 import Form from 'react-bootstrap/Form';
 import {Layout} from "@elastic/react-search-ui-views";
 import log from "loglevel";
-import {cleanJson, eq, getRequestHeaders, getStatusColor} from "../../components/custom/js/functions";
-import {getEntityData, update_create_dataset} from "../../lib/services";
-import AppContext from '../../context/AppContext'
-import EntityContext, {EntityProvider} from '../../context/EntityContext'
+import {cleanJson, eq, getRequestHeaders, getStatusColor, getUBKGFullName} from "@/components/custom/js/functions";
+import {getEntityData, update_create_dataset} from "@/lib/services";
+import AppContext from '@/context/AppContext'
+import EntityContext, {EntityProvider} from '@/context/EntityContext'
 import $ from "jquery";
-import DatasetRevertButton, {statusRevertTooltip} from "../../components/custom/edit/dataset/DatasetRevertButton";
+import DatasetRevertButton, {statusRevertTooltip} from "@/components/custom/edit/dataset/DatasetRevertButton";
 
-const AppFooter = dynamic(() => import("../../components/custom/layout/AppFooter"))
-const AppNavbar = dynamic(() => import("../../components/custom/layout/AppNavbar"))
-const DatasetSubmissionButton = dynamic(() => import("../../components/custom/edit/dataset/DatasetSubmissionButton"))
-const EntityHeader = dynamic(() => import('../../components/custom/layout/entity/Header'))
-const EntityFormGroup = dynamic(() => import('../../components/custom/layout/entity/FormGroup'))
-const GroupSelect = dynamic(() => import("../../components/custom/edit/GroupSelect"))
-const Header = dynamic(() => import("../../components/custom/layout/Header"))
-const SenNetAlert = dynamic(() => import("../../components/SenNetAlert"))
-const SenNetPopover = dynamic(() => import("../../components/SenNetPopover"))
+const AppFooter = dynamic(() => import("@/components/custom/layout/AppFooter"))
+const AppNavbar = dynamic(() => import("@/components/custom/layout/AppNavbar"))
+const DatasetSubmissionButton = dynamic(() => import("@/components/custom/edit/dataset/DatasetSubmissionButton"))
+const DatasetType = dynamic(() => import("@/components/custom/edit/dataset/DatasetType"))
+const EntityHeader = dynamic(() => import('@/components/custom/layout/entity/Header'))
+const EntityFormGroup = dynamic(() => import('@/components/custom/layout/entity/FormGroup'))
+const GroupSelect = dynamic(() => import("@/components/custom/edit/GroupSelect"))
+const Header = dynamic(() => import("@/components/custom/layout/Header"))
+const SenNetAlert = dynamic(() => import("@/components/SenNetAlert"))
+const SenNetPopover = dynamic(() => import("@/components/SenNetPopover"))
 
 
 function EditUpload() {
@@ -41,7 +42,6 @@ function EditUpload() {
         getCancelBtn, isAdminOrHasValue, getAssignedToGroupNames
     } = useContext(EntityContext)
     const {_t, cache, adminGroup, getBusyOverlay, toggleBusyOverlay, getPreviewView} = useContext(AppContext)
-
     const router = useRouter()
     const [source, setSource] = useState(null)
 
@@ -286,6 +286,44 @@ function EditUpload() {
                                                          text={<>Free text field to enter a description of
                                                              the <code>Upload</code>.</>}/>
 
+                                        {/*/!*Intended Dataset Type*!/*/}
+                                         <DatasetType
+                                            datasetTypes={Object.values(cache.datasetTypes)}
+                                            label={'Intended Dataset Type'}
+                                            labelDescription={<>The dataset type of the intended datasets that will be
+                                                uploaded as part of this <code>Upload</code>.</>}
+                                            dataValue={'intended_dataset_type'}
+                                            values={values} data={data} onChange={onChange}/>
+
+                                        {/*/!*Intended Organ*!/*/}
+                                        <Form.Group className="mb-3" controlId="intended_organ_group">
+                                            <Form.Label>Intended Organ<span
+                                                className="required">* </span>
+                                                <SenNetPopover className={'intended_organ'}
+                                                               text={<>The organ that the data contained in
+                                                                   this <code>Upload</code> will be
+                                                                   registered/associated with.</>}>
+                                                    <i className={'bi bi-question-circle-fill'}></i>
+                                                </SenNetPopover>
+                                            </Form.Label>
+
+                                            <Form.Select required aria-label="Intended Organ" id="intended_organ" onChange={e => {
+                                                onChange(e, e.target.id, e.target.value)
+                                            }}
+                                                         defaultValue={data.intended_organ}>
+                                                <option value="">----</option>
+                                                {Object.entries(cache.organTypes).map(op => {
+                                                    return (
+                                                        <option key={op[0]} value={op[0]}>
+                                                            {op[1]}
+                                                        </option>
+                                                    );
+
+                                                })}
+                                            </Form.Select>
+
+                                        </Form.Group>
+
 
                                         <div className={'d-flex flex-row-reverse'}>
                                             {getCancelBtn('upload')}