diff --git a/packages/client/hmi-client/src/components/extracting/tera-drag-n-drop-importer.vue b/packages/client/hmi-client/src/components/extracting/tera-drag-n-drop-importer.vue
index f371378697..3c4dff3e8b 100644
--- a/packages/client/hmi-client/src/components/extracting/tera-drag-n-drop-importer.vue
+++ b/packages/client/hmi-client/src/components/extracting/tera-drag-n-drop-importer.vue
@@ -85,8 +85,6 @@ const props = defineProps({
 				AcceptedTypes.TXT,
 				AcceptedTypes.MD,
 				AcceptedTypes.PY,
-				AcceptedTypes.M,
-				AcceptedTypes.JS,
 				AcceptedTypes.R,
 				AcceptedTypes.JL
 			].every((v) => value.includes(v))
@@ -101,8 +99,6 @@ const props = defineProps({
 				AcceptedExtensions.TXT,
 				AcceptedExtensions.MD,
 				AcceptedExtensions.PY,
-				AcceptedExtensions.M,
-				AcceptedExtensions.JS,
 				AcceptedExtensions.R,
 				AcceptedExtensions.JL
 			].every((v) => value.includes(v))
diff --git a/packages/client/hmi-client/src/components/widgets/tera-import-github-file.vue b/packages/client/hmi-client/src/components/widgets/tera-import-github-file.vue
index 933437fac3..910770be18 100644
--- a/packages/client/hmi-client/src/components/widgets/tera-import-github-file.vue
+++ b/packages/client/hmi-client/src/components/widgets/tera-import-github-file.vue
@@ -192,6 +192,7 @@ import { createNewDatasetFromGithubFile } from '@/services/dataset';
 import { createNewArtifactFromGithubFile } from '@/services/artifact';
 import { extractPDF } from '@/services/models/extractions';
 import useAuthStore from '@/stores/auth';
+import { uploadCodeToProjectFromGithub } from '@/services/code';
 
 const props = defineProps<{
 	urlString: string;
@@ -362,8 +363,14 @@ async function importDocumentFiles(githubFiles: GithubFile[]) {
  * @param githubFiles The code files to open
  */
 async function openCodeFiles(githubFiles: GithubFile[]) {
-	// For now just throw to the document path as they're all artifacts
-	await importDocumentFiles(githubFiles);
+	githubFiles.forEach(async (githubFile) => {
+		await uploadCodeToProjectFromGithub(
+			repoOwnerAndName.value,
+			githubFile.path,
+			props.project?.id ?? '',
+			githubFile.htmlUrl
+		);
+	});
 }
 </script>
 
diff --git a/packages/client/hmi-client/src/components/widgets/tera-tab-group.vue b/packages/client/hmi-client/src/components/widgets/tera-tab-group.vue
index e57c9a48c7..446d2138e8 100644
--- a/packages/client/hmi-client/src/components/widgets/tera-tab-group.vue
+++ b/packages/client/hmi-client/src/components/widgets/tera-tab-group.vue
@@ -60,7 +60,6 @@ const loadingTabIndex = ref();
 const getTabName = (tab: Tab) => {
 	if (tab.assetName) return tab.assetName;
 	if (tab.pageType === ProjectPages.OVERVIEW) return 'Overview';
-	// DVINCE TODO if (tab.pageType === AssetType.CODE) return 'New File';
 	const assets = resourceStore.activeProjectAssets;
 
 	if (assets) {
@@ -71,6 +70,9 @@ const getTabName = (tab: Tab) => {
 		// https://github.com/DARPA-ASKEM/data-service/issues/299
 		return (tab.pageType === AssetType.Publications ? asset?.title : asset?.name) ?? 'n/a';
 	}
+
+	if (tab.pageType === AssetType.Code) return 'New File';
+
 	return 'n/a';
 };
 
diff --git a/packages/client/hmi-client/src/page/project/components/tera-project-overview.vue b/packages/client/hmi-client/src/page/project/components/tera-project-overview.vue
index dcd8bb9855..f3c4bd48e6 100644
--- a/packages/client/hmi-client/src/page/project/components/tera-project-overview.vue
+++ b/packages/client/hmi-client/src/page/project/components/tera-project-overview.vue
@@ -184,8 +184,6 @@
 									AcceptedTypes.TXT,
 									AcceptedTypes.MD,
 									AcceptedTypes.PY,
-									AcceptedTypes.JS,
-									AcceptedTypes.M,
 									AcceptedTypes.R,
 									AcceptedTypes.JL
 								]"
@@ -195,8 +193,6 @@
 									AcceptedExtensions.TXT,
 									AcceptedExtensions.MD,
 									AcceptedExtensions.PY,
-									AcceptedExtensions.M,
-									AcceptedExtensions.JS,
 									AcceptedExtensions.R,
 									AcceptedExtensions.JL
 								]"
@@ -283,6 +279,7 @@ import TeraMultiSelectModal from '@/components/widgets/tera-multi-select-modal.v
 import { useTabStore } from '@/stores/tabs';
 import { extractPDF } from '@/services/models/extractions';
 import useAuthStore from '@/stores/auth';
+import { uploadCodeToProject } from '@/services/code';
 
 const props = defineProps<{
 	project: IProject;
@@ -351,40 +348,77 @@ const assets = computed(() => {
 
 async function processFiles(files: File[], csvDescription: string) {
 	return files.map(async (file) => {
-		if (file.type === AcceptedTypes.CSV) {
-			const addedCSV: CsvAsset | null = await createNewDatasetFromCSV(
-				progress,
-				file,
-				auth.name ?? '',
-				props.project.id,
-				csvDescription
-			);
-
-			if (addedCSV !== null) {
-				const text: string = addedCSV?.csv?.join('\r\n') ?? '';
-				const images = [];
-
-				return { file, error: false, response: { text, images } };
-			}
-			return { file, error: true, response: { text: '', images: [] } };
+		switch (file.type) {
+			case AcceptedTypes.CSV:
+				return processDataset(file, csvDescription);
+			case AcceptedTypes.PDF:
+			case AcceptedTypes.TXT:
+			case AcceptedTypes.MD:
+				return processArtifact(file);
+			case AcceptedTypes.PY:
+			case AcceptedTypes.R:
+			case AcceptedTypes.JL:
+				return processCode(file);
+			default:
+				return { file, error: true, response: { text: '', images: [] } };
 		}
-
-		// This is pdf, txt, md files
-		const artifact: Artifact | null = await uploadArtifactToProject(
-			progress,
-			file,
-			props.project.username ?? '',
-			props.project.id,
-			''
-		);
-		if (artifact && file.name.toLowerCase().endsWith('.pdf')) {
-			extractPDF(artifact);
-			return { file, error: false, response: { text: '', images: [] } };
-		}
-		return { file, error: true, response: { text: '', images: [] } };
 	});
 }
 
+/**
+ * Process a python, R or Julia file into a code asset
+ * @param file
+ */
+async function processCode(file: File) {
+	// This is pdf, txt, md files
+	await uploadCodeToProject(props.project.id, file, progress);
+
+	return { file, error: true, response: { text: '', images: [] } };
+}
+
+/**
+ * Process a pdf, txt, md file into an artifact
+ * @param file
+ */
+async function processArtifact(file: File) {
+	// This is pdf, txt, md files
+	const artifact: Artifact | null = await uploadArtifactToProject(
+		progress,
+		file,
+		props.project.username ?? '',
+		props.project.id,
+		''
+	);
+	if (artifact && file.name.toLowerCase().endsWith('.pdf')) {
+		await extractPDF(artifact);
+		return { file, error: false, response: { text: '', images: [] } };
+	}
+	return { file, error: true, response: { text: '', images: [] } };
+}
+
+/**
+ * Process a csv file into a dataset
+ * @param file
+ * @param description
+ */
+async function processDataset(file: File, description: string) {
+	const addedCSV: CsvAsset | null = await createNewDatasetFromCSV(
+		progress,
+		file,
+		auth.name ?? '',
+		props.project.id,
+		description
+	);
+
+	if (addedCSV !== null) {
+		const text: string = addedCSV?.csv?.join('\r\n') ?? '';
+		const images = [];
+
+		return { file, error: false, response: { text, images } };
+	}
+	return { file, error: true, response: { text: '', images: [] } };
+}
+
 const onRowSelect = (selectedRows) => {
 	// show multi select modal when there are selectedRows otherwise hide
 	showMultiSelect.value = selectedRows.length !== 0;
diff --git a/packages/client/hmi-client/src/page/project/components/tera-project-page.vue b/packages/client/hmi-client/src/page/project/components/tera-project-page.vue
index 3b2f76eeb4..dc66c04cd0 100644
--- a/packages/client/hmi-client/src/page/project/components/tera-project-page.vue
+++ b/packages/client/hmi-client/src/page/project/components/tera-project-page.vue
@@ -5,15 +5,15 @@
 		:project="project"
 		@asset-loaded="emit('asset-loaded')"
 	/>
-	<!-- DVINCE TODO
+
 	<code-editor
-		v-else-if="pageType === AssetType.CODE"
+		v-else-if="pageType === AssetType.Code"
 		:initial-code="code"
 		@vue:mounted="
 			emit('asset-loaded');
-			openNextCodeFile();
+			openCode();
 		"
-	/>-->
+	/>
 	<code-editor
 		v-else-if="pageType === AssetType.Artifacts && !assetName?.endsWith('.pdf')"
 		:initial-code="code"
@@ -65,12 +65,12 @@
 </template>
 
 <script setup lang="ts">
-import { ref, Ref, computed } from 'vue';
+import { ref, computed } from 'vue';
 import { ProjectPages, IProject } from '@/types/Project';
 import { useRouter } from 'vue-router';
 import { RouteName } from '@/router/routes';
 import { isEmpty } from 'lodash';
-import { CodeRequest, Tab } from '@/types/common';
+import { Tab } from '@/types/common';
 import Button from 'primevue/button';
 import TeraDocument from '@/components/documents/tera-document.vue';
 import TeraDataset from '@/components/dataset/tera-dataset.vue';
@@ -83,6 +83,7 @@ import { getArtifactArrayBuffer, getArtifactFileAsText } from '@/services/artifa
 import TeraPdfEmbed from '@/components/widgets/tera-pdf-embed.vue';
 import useResourceStore from '@/stores/resources';
 import { AssetType } from '@/types/Types';
+import { getCodeFileAsText } from '@/services/code';
 
 const props = defineProps<{
 	project: IProject;
@@ -100,11 +101,9 @@ const router = useRouter();
 
 const code = ref<string>();
 
-const queuedCodeRequests: Ref<CodeRequest[]> = ref([]);
-
 const assetName = computed<string>(() => {
 	if (props.pageType === ProjectPages.OVERVIEW) return 'Overview';
-	// dvince TODO if (props.pageType === ProjectAssetTypes.CODE) return 'New File';
+
 	const assets = resourceStore.activeProjectAssets;
 
 	/**
@@ -115,8 +114,9 @@ const assetName = computed<string>(() => {
 	 */
 	if (assets) {
 		const asset: any = assets[props.pageType as string].find((d: any) => d.id === props.assetId);
-		return asset.name ?? 'n/a';
+		if (asset.name) return asset.name;
 	}
+	if (props.pageType === AssetType.Code) return 'New File';
 	return 'n/a';
 });
 
@@ -130,23 +130,10 @@ const openOverview = () => {
 		params: { pageType: ProjectPages.OVERVIEW, assetId: undefined }
 	});
 };
-async function openCode(codeRequests: CodeRequest[]) {
-	queuedCodeRequests.value = codeRequests;
-	await openNextCodeFile();
-}
-
-async function openNextCodeFile() {
-	if (queuedCodeRequests.value.length > 0) {
-		const currentRequest: CodeRequest | undefined = queuedCodeRequests.value.pop();
-
-		if (!currentRequest) return;
-
-		code.value = currentRequest.code;
-		await router.push({
-			name: RouteName.ProjectRoute,
-			params: currentRequest.asset
-		});
-	}
+async function openCode() {
+	const res: string | null = await getCodeFileAsText(props.assetId!, assetName.value!);
+	if (!res) return;
+	code.value = res;
 }
 
 function getPDFBytes(): Promise<ArrayBuffer | null> {
diff --git a/packages/client/hmi-client/src/page/project/components/tera-resource-sidebar.vue b/packages/client/hmi-client/src/page/project/components/tera-resource-sidebar.vue
index f1f750b2f5..d602d5cffd 100644
--- a/packages/client/hmi-client/src/page/project/components/tera-resource-sidebar.vue
+++ b/packages/client/hmi-client/src/page/project/components/tera-resource-sidebar.vue
@@ -227,15 +227,15 @@ function endDrag() {
 const optionsMenu = ref();
 const optionsMenuItems = ref([
 	{
-		/* DVINCE TODO key: ProjectAssetTypes.CODE,
+		key: AssetType.Code,
 		label: 'Code editor',
 		command() {
 			emit('open-asset', {
 				assetName: 'New file',
-				pageType: ProjectAssetTypes.CODE,
+				pageType: AssetType.Code,
 				assetId: undefined
 			});
-		} */
+		}
 	},
 	{
 		key: AssetType.Models,
diff --git a/packages/client/hmi-client/src/page/project/tera-project.vue b/packages/client/hmi-client/src/page/project/tera-project.vue
index b04d6c19cf..95cc2dd125 100644
--- a/packages/client/hmi-client/src/page/project/tera-project.vue
+++ b/packages/client/hmi-client/src/page/project/tera-project.vue
@@ -296,10 +296,11 @@ const overviewResource = {
 	pageType: ProjectPages.OVERVIEW,
 	assetId: ''
 };
-// const codeResource = {
-//	pageType: ProjectAssetTypes.CODE,
-//	assetId: ''
-// };
+
+const codeResource = {
+	pageType: AssetType.Code,
+	assetId: ''
+};
 
 const adjustTabsProjectChange = () => {
 	const pageType = openedAssetRoute.value.pageType;
@@ -344,11 +345,10 @@ const adjustTabs = () => {
 
 	// If new code or overview
 	if (!tabExist && !assetId) {
-		// DVINCE TODO
-		/* if (pageType === ProjectAssetTypes.CODE) {
+		if (pageType === AssetType.Code) {
 			tabStore.addTab(projectId, codeResource);
 			openAsset();
-		} else */ if (pageType === ProjectPages.OVERVIEW) {
+		} else if (pageType === ProjectPages.OVERVIEW) {
 			tabStore.addTab(projectId, overviewResource);
 			openAsset(0);
 		}
diff --git a/packages/client/hmi-client/src/router/routes.ts b/packages/client/hmi-client/src/router/routes.ts
index 317c551760..8f13082cfd 100644
--- a/packages/client/hmi-client/src/router/routes.ts
+++ b/packages/client/hmi-client/src/router/routes.ts
@@ -17,8 +17,8 @@ export const RouteMetadata: {
 	[RouteName.ProjectRoute]: { displayName: 'Project summary', icon: IconAccount32 },
 	[RouteName.CodeRoute]: {
 		displayName: 'Code',
-		icon: IconCode32
-		// dvince TODO projectAsset: ProjectAssetTypes.CODE
+		icon: IconCode32,
+		projectAsset: AssetType.Code
 	},
 	[RouteName.ProvenanceRoute]: { displayName: 'Provenance', icon: IconFlow32 },
 	[RouteName.HomeRoute]: { displayName: 'Home', icon: 'pi pi-home' },
diff --git a/packages/client/hmi-client/src/services/code.ts b/packages/client/hmi-client/src/services/code.ts
new file mode 100644
index 0000000000..4e628fcace
--- /dev/null
+++ b/packages/client/hmi-client/src/services/code.ts
@@ -0,0 +1,142 @@
+import API from '@/api/api';
+import { AssetType, Code, ProgrammingLanguage } from '@/types/Types';
+import { Ref } from 'vue';
+import { addAsset } from '@/services/project';
+import { logger } from '@/utils/logger';
+
+async function getCodeFileAsText(codeAssetId: string, fileName: string): Promise<string | null> {
+	const response = await API.get(
+		`/code-asset/${codeAssetId}/download-code-as-text?filename=${fileName}`,
+		{}
+	);
+
+	if (!response || response.status >= 400) {
+		logger.error('Error getting code file as text');
+		return null;
+	}
+
+	return response.data;
+}
+
+async function uploadCodeToProject(
+	projectId: string,
+	file: File,
+	progress: Ref<number>
+): Promise<Code | null> {
+	// Create a new code asset with the same name as the file and post the metadata to TDS
+	const codeAsset: Code = {
+		name: file.name,
+		description: file.name,
+		filename: file.name,
+		language: getProgrammingLanguage(file.name)
+	};
+
+	const newCodeAsset: Code | null = await createNewCodeAsset(codeAsset);
+	if (!newCodeAsset || !newCodeAsset.id) return null;
+
+	const successfulUpload = await addFileToCodeAsset(newCodeAsset.id, file, progress);
+	if (!successfulUpload) return null;
+
+	const resp = addAsset(projectId, AssetType.Code, newCodeAsset.id);
+	if (!resp) return null;
+
+	return newCodeAsset;
+}
+
+/**
+ * This is a helper function to take an arbitrary file from a github repo and create a new code asset from it
+ * @param repoOwnerAndName
+ * @param path
+ * @param userName
+ * @param projectId
+ */
+async function uploadCodeToProjectFromGithub(
+	repoOwnerAndName: string,
+	path: string,
+	projectId: string,
+	url: string
+): Promise<Code | null> {
+	// Find the file name by removing the path portion
+	const fileName: string | undefined = path.split('/').pop();
+
+	if (!fileName) return null;
+
+	// Create a new code asset with the same name as the file and post the metadata to TDS
+	const codeAsset: Code = {
+		name: fileName,
+		description: path,
+		filename: fileName,
+		language: getProgrammingLanguage(fileName),
+		repoUrl: url
+	};
+
+	const newCode: Code | null = await createNewCodeAsset(codeAsset);
+	if (!newCode || !newCode.id) return null;
+
+	const urlResponse = await API.put(
+		`/code-asset/${newCode.id}/uploadCodeFromGithub?filename=${fileName}&path=${path}&repoOwnerAndName=${repoOwnerAndName}`,
+		{
+			timeout: 30000
+		}
+	);
+
+	if (!urlResponse || urlResponse.status >= 400) {
+		logger.error(`Failed to upload code from github: ${urlResponse}`);
+		return null;
+	}
+
+	const resp = addAsset(projectId, AssetType.Code, newCode.id);
+
+	if (!resp) return null;
+
+	return newCode;
+}
+
+async function createNewCodeAsset(codeAsset: Code): Promise<Code | null> {
+	const response = await API.post('/code-asset', codeAsset);
+	if (!response || response.status >= 400) return null;
+	return response.data;
+}
+
+async function addFileToCodeAsset(
+	codeAssetId: string,
+	file: File,
+	progress: Ref<number>
+): Promise<boolean> {
+	const formData = new FormData();
+	formData.append('file', file);
+
+	const response = await API.put(`/code-asset/${codeAssetId}/uploadFile`, formData, {
+		params: {
+			filename: file.name
+		},
+		headers: {
+			'Content-Type': 'multipart/form-data'
+		},
+		onUploadProgress(progressEvent) {
+			progress.value = Math.min(
+				100,
+				Math.round((progressEvent.loaded * 100) / (progressEvent?.total ?? 100))
+			);
+		}
+	});
+
+	return response && response.status < 400;
+}
+
+function getProgrammingLanguage(fileName: string): ProgrammingLanguage {
+	// given the extension of a file, return the programming language
+	const fileExtensiopn: string = fileName.split('.').pop() || '';
+	switch (fileExtensiopn) {
+		case 'py':
+			return ProgrammingLanguage.Python;
+		case 'jl':
+			return ProgrammingLanguage.Julia;
+		case 'r':
+			return ProgrammingLanguage.R;
+		default:
+			return ProgrammingLanguage.Python; // TODO do we need an "unknown" language?
+	}
+}
+
+export { uploadCodeToProject, getCodeFileAsText, uploadCodeToProjectFromGithub };
diff --git a/packages/client/hmi-client/src/services/project.ts b/packages/client/hmi-client/src/services/project.ts
index 6645f816df..4d5cb675ad 100644
--- a/packages/client/hmi-client/src/services/project.ts
+++ b/packages/client/hmi-client/src/services/project.ts
@@ -226,7 +226,7 @@ const icons = new Map<string | AssetType, string | Component>([
 	[AssetType.Models, 'share-2'],
 	[AssetType.Datasets, DatasetIcon],
 	[AssetType.Simulations, 'settings'],
-	// DVINCE TODO [ProjectAssetTypes.CODE, 'code'],
+	[AssetType.Code, 'code'],
 	[AssetType.Workflows, 'git-merge'],
 	['overview', 'layout']
 ]);
diff --git a/packages/client/hmi-client/src/types/Project.ts b/packages/client/hmi-client/src/types/Project.ts
index e67b5b5edf..84ceeb9c72 100644
--- a/packages/client/hmi-client/src/types/Project.ts
+++ b/packages/client/hmi-client/src/types/Project.ts
@@ -1,4 +1,4 @@
-import { DocumentAsset, Document, Dataset, Model, Artifact, AssetType } from '@/types/Types';
+import { DocumentAsset, Document, Dataset, Model, Artifact, AssetType, Code } from '@/types/Types';
 import { Workflow } from '@/types/workflow';
 
 export enum ProjectPages {
@@ -11,15 +11,20 @@ export enum ProjectPages {
 export const isProjectAssetTypes = (type: AssetType | string): boolean =>
 	Object.values(AssetType).includes(type as AssetType);
 
+// TODO this is essentially the same as Assets from Types.tx, however for some reason the
+// Workflows class referenced here is only implemented on the front end and not
+// driven by the TypeScrypt generation on the backend. This should be fixed.
 export type ProjectAssets = {
 	[AssetType.Publications]: DocumentAsset[];
 	[AssetType.Models]: Model[];
 	[AssetType.Datasets]: Dataset[];
-	// DVINCE TODO[ProjectAssetTypes.CODE]: any[];
+	[AssetType.Code]: Code[];
 	[AssetType.Artifacts]: Artifact[];
 	[AssetType.Workflows]: Workflow[];
 };
 
+// TODO this is essentially the same as Project from Types.ts, however it references
+// the above ProjectAssets type instead of the Assets type. This should be fixed.
 export interface IProject {
 	id: string;
 	name: string;
diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index c6ac343052..61200a1c97 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -131,6 +131,17 @@ export interface Simulation {
     projectId?: number;
 }
 
+export interface Code {
+    id?: string;
+    timestamp?: Date;
+    name: string;
+    description: string;
+    filename: string;
+    repoUrl?: string;
+    language: ProgrammingLanguage;
+    metadata?: any;
+}
+
 export interface Dataset {
     id?: string;
     timestamp?: any;
@@ -327,6 +338,7 @@ export interface Assets {
     publications: DocumentAsset[];
     workflows: Workflow[];
     artifacts: Artifact[];
+    code: Code[];
 }
 
 export interface Document {
@@ -638,6 +650,12 @@ export enum ProvenanceType {
     Concept = "Concept",
 }
 
+export enum ProgrammingLanguage {
+    Python = "python",
+    R = "r",
+    Julia = "julia",
+}
+
 export enum ColumnType {
     Unknown = "UNKNOWN",
     Boolean = "BOOLEAN",
@@ -661,6 +679,7 @@ export enum AssetType {
     Simulations = "simulations",
     Workflows = "workflows",
     Artifacts = "artifacts",
+    Code = "code",
 }
 
 export enum OntologicalField {
diff --git a/packages/client/hmi-client/src/types/common.ts b/packages/client/hmi-client/src/types/common.ts
index 7f9b063f70..5ac8a1c07c 100644
--- a/packages/client/hmi-client/src/types/common.ts
+++ b/packages/client/hmi-client/src/types/common.ts
@@ -117,8 +117,6 @@ export enum AcceptedTypes {
 	TXT = 'text/plain',
 	MD = 'text/markdown',
 	PY = 'text/x-python-script',
-	M = 'text/x-matlab',
-	JS = 'application/javascript',
 	R = 'text/x-r',
 	JL = 'application/julia'
 }
@@ -129,8 +127,6 @@ export enum AcceptedExtensions {
 	TXT = 'txt',
 	MD = 'md',
 	PY = 'py',
-	M = 'm',
-	JS = 'js',
 	R = 'r',
 	JL = 'jl'
 }
diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/code/GithubRepo.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/code/GithubRepo.java
index 9bc49dca3a..c734bc9d84 100644
--- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/code/GithubRepo.java
+++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/code/GithubRepo.java
@@ -19,7 +19,7 @@
 public class GithubRepo {
 
 	@TSIgnore
-	private static final List<String> CODE_TYPES = new ArrayList<>(List.of(".py", ".m", ".js", ".R", ".jl" ));
+	private static final List<String> CODE_TYPES = new ArrayList<>(List.of(".py", ".R", ".jl" ));
 
 	@TSIgnore
 	private static final List<String> DATA_TYPES = new ArrayList<>(List.of(".csv", ".json", ".tsv", ".xml", ".yaml", ".yml"));
diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Artifact.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Artifact.java
index 48db68f9b5..70a02499c5 100644
--- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Artifact.java
+++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Artifact.java
@@ -20,7 +20,7 @@
 @TSModel
 public class Artifact {
 
-	/* The name of the artifact. */
+	/* The id of the artifact. */
 	@TSOptional
 	private String id;
 
diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Assets.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Assets.java
index 1bd2b62be1..0e7069679f 100644
--- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Assets.java
+++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Assets.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
+import software.uncharted.terarium.hmiserver.models.dataservice.code.Code;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
 import software.uncharted.terarium.hmiserver.models.documentservice.Extraction;
 
@@ -20,6 +21,7 @@ public class Assets implements Serializable {
 	List<DocumentAsset> publications;
 	List<Workflow> workflows;
 	List<Artifact> artifacts;
+	List<Code> code;
 
 
 	public enum AssetType {
@@ -29,8 +31,8 @@ public enum AssetType {
 		PUBLICATIONS("publications"),
 		SIMULATIONS("simulations"),
 		WORKFLOWS("workflows"),
-		ARTIFACTS("artifacts");
-		//CODE("code");
+		ARTIFACTS("artifacts"),
+		CODE("code");
 
 
 
diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/code/Code.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/code/Code.java
new file mode 100644
index 0000000000..d14941f652
--- /dev/null
+++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/code/Code.java
@@ -0,0 +1,69 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.code;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.annotations.TSOptional;
+
+import java.time.Instant;
+
+@Data
+@Accessors(chain = true)
+@TSModel
+public class Code {
+
+    /* The id of the code. */
+    @TSOptional
+    private String id;
+
+    /* Timestamp of creation */
+    @TSOptional
+    private Instant timestamp;
+
+    /* The name of the code. */
+    private String name;
+
+    /* The description of the code. */
+    private String description;
+
+    /* The name of the file in this code*/
+    private String filename;
+
+    /* The optional URL for where this code came from */
+    @TSOptional
+    @JsonAlias("repo_url")
+    private String repoUrl;
+
+    /* The programming language of this code */
+    private ProgrammingLanguage language;
+
+    /* The optional metadata for this code */
+    @TSOptional
+    private JsonNode metadata;
+
+
+    public enum ProgrammingLanguage {
+        PYTHON("python"),
+        R("r"),
+        Julia("julia");
+
+        public final String language;
+
+        ProgrammingLanguage(final String language) {
+            this.language = language;
+        }
+
+        @Override
+        @JsonValue
+        public String toString() {
+            return language;
+        }
+
+        public static ProgrammingLanguage fromString(final String language) {
+            return ProgrammingLanguage.valueOf(language.toUpperCase());
+        }
+    }
+}
diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/CodeProxy.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/CodeProxy.java
new file mode 100644
index 0000000000..a2fe994081
--- /dev/null
+++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/proxies/dataservice/CodeProxy.java
@@ -0,0 +1,56 @@
+package software.uncharted.terarium.hmiserver.proxies.dataservice;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import software.uncharted.terarium.hmiserver.annotations.LogRestClientTime;
+import software.uncharted.terarium.hmiserver.models.dataservice.code.Code;
+import software.uncharted.terarium.hmiserver.models.dataservice.dataset.PresignedURL;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+import java.util.List;
+
+/**
+ * Proxies the TDS code endpoints
+ */
+@RegisterRestClient(configKey = "data-service")
+@Path("/code")
+@Produces("application/json")
+@Consumes("application/json")
+public interface CodeProxy {
+
+    	@GET
+		@LogRestClientTime
+    	List<Code> getCodes( @DefaultValue("100") @QueryParam("page_size") Integer pageSize, @DefaultValue("0") @QueryParam("page") Integer page);
+
+		@POST
+		@LogRestClientTime
+		Code createCode(JsonNode code);
+
+		@GET
+		@Path("/{id}")
+		@LogRestClientTime
+		Code getCode(@PathParam("id") String codeId);
+
+		@PUT
+		@Path("/{id}")
+		@LogRestClientTime
+		Code updateCode(@PathParam("id") String codeId, Code code);
+
+		@DELETE
+		@Path("/{id}")
+		@LogRestClientTime
+		Response deleteCode(@PathParam("id") String codeId);
+
+		@GET
+		@Path("/{id}/download-url")
+		@LogRestClientTime
+		PresignedURL getCodeDownloadUrl(@PathParam("id") String codeId, @QueryParam("filename") String filename);
+
+		@GET
+		@Path("/{id}/upload-url")
+		@LogRestClientTime
+		PresignedURL getCodeUploadUrl(@PathParam("id") String codeId, @QueryParam("filename") String filename);
+
+
+}
diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/CodeResource.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/CodeResource.java
new file mode 100644
index 0000000000..5a40101447
--- /dev/null
+++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/resources/dataservice/CodeResource.java
@@ -0,0 +1,187 @@
+package software.uncharted.terarium.hmiserver.resources.dataservice;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.eclipse.microprofile.openapi.annotations.tags.Tag;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import software.uncharted.terarium.hmiserver.models.dataservice.code.Code;
+import software.uncharted.terarium.hmiserver.models.dataservice.dataset.PresignedURL;
+import software.uncharted.terarium.hmiserver.proxies.dataservice.CodeProxy;
+import software.uncharted.terarium.hmiserver.proxies.jsdelivr.JsDelivrProxy;
+import software.uncharted.terarium.hmiserver.resources.SnakeCaseResource;
+
+import javax.inject.Inject;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+
+@Path("/api/code-asset")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+@Tag(name = "Code")
+@Slf4j
+public class CodeResource implements SnakeCaseResource {
+
+	@Inject
+	@RestClient
+	CodeProxy codeProxy;
+
+	@RestClient
+	@Inject
+	JsDelivrProxy gitHubProxy;
+
+
+	@GET
+	@Tag(name = "Get Codes from TDS Proxy")
+	public List<Code> getCodes(@DefaultValue("100") @QueryParam("page_size") Integer pageSize, @DefaultValue("0") @QueryParam("page") Integer page) {
+		return codeProxy.getCodes(pageSize, page);
+	}
+
+	@POST
+	@Tag(name = "Create Code in TDS Proxy")
+	public Code createCode(Code code) {
+
+		return codeProxy.createCode(convertObjectToSnakeCaseJsonNode(code));
+	}
+
+	@GET
+	@Path("/{id}")
+	@Tag(name = "Get specific Code from TDS Proxy")
+	public Code getCode(@PathParam("id") String codeId) {
+		return codeProxy.getCode(codeId);
+	}
+
+	@PUT
+	@Path("/{id}")
+	@Tag(name = "Update Code in TDS Proxy")
+	public Code updateCode(@PathParam("id") String codeId, Code code) {
+		return codeProxy.updateCode(codeId, code);
+	}
+
+	@DELETE
+	@Path("/{id}")
+	@Tag(name = "Delete Code in TDS Proxy")
+	public Response deleteCode(@PathParam("id") String codeId) {
+		return codeProxy.deleteCode(codeId);
+	}
+
+	@GET
+	@Path("/{id}/download-code-as-text")
+	@Tag(name = "Get Code File from S3")
+	public Response getCodeFileAsText(@PathParam("id") String codeId, @QueryParam("filename") String filename) {
+
+		log.debug("Downloading code file {} for code {}", filename, codeId);
+
+		try (CloseableHttpClient httpclient = HttpClients.custom()
+			.disableRedirectHandling()
+			.build()) {
+
+			PresignedURL presignedURL = codeProxy.getCodeDownloadUrl(codeId, filename);
+			final HttpGet httpGet = new HttpGet(presignedURL.getUrl());
+			final HttpResponse response = httpclient.execute(httpGet);
+			final String textFileAsString = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+
+			return Response.status(Response.Status.OK).entity(textFileAsString).type(MediaType.TEXT_PLAIN).build();
+
+
+		} catch (Exception e) {
+			log.error("Unable to GET code data", e);
+			return Response
+				.status(Response.Status.INTERNAL_SERVER_ERROR)
+				.type(MediaType.APPLICATION_JSON)
+				.build();
+		}
+
+	}
+
+	@PUT
+	@Path("/{codeId}/uploadFile")
+	@Consumes(MediaType.MULTIPART_FORM_DATA)
+	@Tag(name = "Upload Code file to TDS Proxy")
+	public Response uploadFile(
+		@PathParam("codeId") final String codeId,
+		@QueryParam("filename") final String filename,
+		Map<String, InputStream> input
+	) throws IOException {
+
+		log.debug("Uploading code {} to project", codeId);
+
+		byte[] fileAsBytes = input.get("file").readAllBytes();
+		HttpEntity fileEntity = new ByteArrayEntity(fileAsBytes, ContentType.APPLICATION_OCTET_STREAM);
+		return uploadCodeHelper(codeId, filename, fileEntity);
+
+
+	}
+
+	/**
+	 * Downloads a file from GitHub given the path and owner name, then uploads it to the project.
+	 */
+	@PUT
+	@Path("/{codeId}/uploadCodeFromGithub")
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Tag(name = "Upload Code from Github to TDS Proxy")
+	public Response uploadCodeFromGithub(
+		@PathParam("codeId") final String codeId,
+		@QueryParam("path") final String path,
+		@QueryParam("repoOwnerAndName") final String repoOwnerAndName,
+		@QueryParam("filename") final String filename
+	){
+		log.debug("Uploading code file from github to dataset {}", codeId);
+
+		//download file from GitHub
+		String fileString = gitHubProxy.getGithubCode(repoOwnerAndName, path);
+		HttpEntity fileEntity = new StringEntity(fileString, ContentType.TEXT_PLAIN);
+		return uploadCodeHelper(codeId, filename, fileEntity);
+
+	}
+
+	/**
+	 * Uploads an code inside the entity to TDS via a presigned URL
+	 * @param codeId The ID of the code to upload to
+	 * @param fileName The name of the file to upload
+	 * @param codeHttpEntity The entity containing the code to upload
+	 * @return A response containing the status of the upload
+	 */
+	private Response uploadCodeHelper(String codeId, String fileName, HttpEntity codeHttpEntity){
+
+		try (CloseableHttpClient httpclient = HttpClients.custom()
+			.disableRedirectHandling()
+			.build()) {
+
+			// upload file to S3
+			final PresignedURL presignedURL = codeProxy.getCodeUploadUrl(codeId, fileName);
+			final HttpPut put = new HttpPut(presignedURL.getUrl());
+			put.setEntity(codeHttpEntity);
+			final HttpResponse response = httpclient.execute(put);
+
+
+			return Response
+				.status(response.getStatusLine().getStatusCode())
+				.type(MediaType.APPLICATION_JSON)
+				.build();
+
+
+		} catch (Exception e) {
+			log.error("Unable to PUT code data", e);
+			return Response
+				.status(Response.Status.INTERNAL_SERVER_ERROR)
+				.type(MediaType.APPLICATION_JSON)
+				.build();
+		}
+	}
+
+}