diff --git a/package.json b/package.json
index 0610c8b..11d17da 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,6 @@
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
-		"prebuild": "curl https://raw.githubusercontent.com/sailpoint-oss/api-specs/main/dereferenced/deref-sailpoint-api.v3.yaml -o src/lib/V3Spec.yaml && curl https://raw.githubusercontent.com/sailpoint-oss/api-specs/main/dereferenced/deref-sailpoint-api.beta.yaml -o src/lib/BetaSpec.yaml && yq -o=json eval src/lib/V3Spec.yaml > src/routes/api-client/V3Spec.json && yq -o=json eval src/lib/BetaSpec.yaml > src/routes/api-client/BetaSpec.json",
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
@@ -27,6 +26,7 @@
 		"@typescript-eslint/parser": "^5.45.0",
 		"algoliasearch": "^4.17.0",
 		"autoprefixer": "^10.4.14",
+		"axios": "^1.4.0",
 		"dayjs": "^1.11.7",
 		"eslint": "^8.28.0",
 		"eslint-config-prettier": "^8.5.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4cdd81a..13b51bd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -43,6 +43,9 @@ devDependencies:
   autoprefixer:
     specifier: ^10.4.14
     version: 10.4.14(postcss@8.4.23)
+  axios:
+    specifier: ^1.4.0
+    version: 1.4.0
   dayjs:
     specifier: ^1.11.7
     version: 1.11.7
@@ -1141,6 +1144,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /asynckit@0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+    dev: true
+
   /autoprefixer@10.4.14(postcss@8.4.23):
     resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==}
     engines: {node: ^10 || ^12 || >=14}
@@ -1172,6 +1179,16 @@ packages:
       - debug
     dev: true
 
+  /axios@1.4.0:
+    resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==}
+    dependencies:
+      follow-redirects: 1.15.2
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+    dev: true
+
   /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: true
@@ -1311,6 +1328,13 @@ packages:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
     dev: true
 
+  /combined-stream@1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
+    dependencies:
+      delayed-stream: 1.0.0
+    dev: true
+
   /commander@4.1.1:
     resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
     engines: {node: '>= 6'}
@@ -1384,6 +1408,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+    dev: true
+
   /detect-indent@6.1.0:
     resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
     engines: {node: '>=8'}
@@ -1730,6 +1759,15 @@ packages:
         optional: true
     dev: true
 
+  /form-data@4.0.0:
+    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
+    engines: {node: '>= 6'}
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+    dev: true
+
   /fraction.js@4.2.0:
     resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==}
     dev: true
@@ -2102,6 +2140,18 @@ packages:
       picomatch: 2.3.1
     dev: true
 
+  /mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+    dev: true
+
+  /mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+    dependencies:
+      mime-db: 1.52.0
+    dev: true
+
   /mime@3.0.0:
     resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
     engines: {node: '>=10.0.0'}
@@ -2441,6 +2491,10 @@ packages:
     hasBin: true
     dev: true
 
+  /proxy-from-env@1.1.0:
+    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
+    dev: true
+
   /punycode@2.3.0:
     resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
diff --git a/src/lib/Components/CurrentUser.svelte b/src/lib/Components/CurrentUser.svelte
index cd1d505..f79b386 100644
--- a/src/lib/Components/CurrentUser.svelte
+++ b/src/lib/Components/CurrentUser.svelte
@@ -5,7 +5,7 @@
 </script>
 
 <div class="p-2 card variant-soft-surface min-w-[150px]">
-	<p class="underline text-center pb-2">Current User</p>
+	<h1 class="text-center pb-2">Current User</h1>
 	<div class="flex flex-row justify-between">
 		<p class="text-sm">Account:</p>
 		<p class="text-sm">{$tenantData.uid}</p>
diff --git a/src/lib/Components/HostingData.svelte b/src/lib/Components/HostingData.svelte
index 6aa963c..e4d005c 100644
--- a/src/lib/Components/HostingData.svelte
+++ b/src/lib/Components/HostingData.svelte
@@ -5,7 +5,7 @@
 </script>
 
 <div class="p-2 card variant-soft-surface min-w-[150px]">
-	<p class="underline text-center pb-2">Hosting Data</p>
+	<h1 class="text-center pb-2">Hosting Data</h1>
 	<div class="flex flex-row justify-between">
 		<p class="text-sm">Org:</p>
 		<p class="text-sm">{$hostingData.org}</p>
diff --git a/src/lib/Components/StatusPage.svelte b/src/lib/Components/StatusPage.svelte
index 80fad52..9ce23b5 100644
--- a/src/lib/Components/StatusPage.svelte
+++ b/src/lib/Components/StatusPage.svelte
@@ -16,7 +16,7 @@
 </script>
 
 <div class="p-2 card variant-soft-surface min-w-[183.53px]">
-	<p class="underline text-center pb-2">Status Page</p>
+	<h1 class="text-center pb-2">Status Page</h1>
 	<div class="flex flex-row gap-2 justify-center">
 		{#await resp}
 			<div class="placeholder-circle w-16" />
diff --git a/src/lib/Components/Support.svelte b/src/lib/Components/Support.svelte
index 2620ee7..742dc4f 100644
--- a/src/lib/Components/Support.svelte
+++ b/src/lib/Components/Support.svelte
@@ -15,7 +15,7 @@
 </script>
 
 <div class="p-2 card variant-soft-surface">
-	<p class="underline text-center pb-2">Support</p>
+	<h1 class="text-center pb-2">Support</h1>
 	<div class="flex flex-col gap-2">
 		{#each links as link}
 			<a class="btn btn-sm variant-filled" target="_blank" rel="noreferrer" href={link.href}>
diff --git a/src/lib/Components/TenantData.svelte b/src/lib/Components/TenantData.svelte
index 871b98a..17c6499 100644
--- a/src/lib/Components/TenantData.svelte
+++ b/src/lib/Components/TenantData.svelte
@@ -5,7 +5,7 @@
 </script>
 
 <div class="p-2 card variant-soft-surface min-w-[150px]">
-	<p class="underline text-center pb-2">Tenant Data</p>
+	<h1 class="text-center pb-2">Tenant Data</h1>
 	<div class="flex flex-row flex-wrap justify-between">
 		<p class="text-sm">Name:</p>
 		<p class="text-sm px-1">{$tenantData.org.name}</p>
diff --git a/src/routes/api-client/+page.svelte b/src/routes/api-client/+page.svelte
index d3632c2..0e22de5 100644
--- a/src/routes/api-client/+page.svelte
+++ b/src/routes/api-client/+page.svelte
@@ -1,63 +1,148 @@
 <script lang="ts">
+	import { idnSession } from '$lib/settings';
 	import { Tab, TabGroup } from '@skeletonlabs/skeleton';
 	import { JSONEditor } from 'svelte-jsoneditor';
 	import 'svelte-jsoneditor/themes/jse-theme-dark.css';
 
-	import { paths as V2Spec } from './IdentityNow-V2-APIReference.json';
-	import { paths as BetaSpec } from './IdentityNow-Beta-APIReference.json';
-	import { paths as V3Spec } from './IdentityNow-V3-APIReference.json';
-	import { paths as CCSpec } from './Identitynow-CC-APIReference.json';
+	import { paths as V2Spec } from './BetaSpec.json';
+	import { paths as BetaSpec } from './V3Spec.json';
+	import { paths as V3Spec } from './V2Spec.json';
+	import { paths as CCSpec } from './CCSpec.json';
 
-	let APIVersions;
+	import axios, { type AxiosResponse } from 'axios';
 
-	let specification = BetaSpec;
-	let path = Object.entries(specification.paths)[0][0];
+	function mapPath(path: string[]) {
+		const [name, value] = path;
+		return { name, value };
+	}
+
+	async function makeAPICall() {
+		const response = await axios({
+			method: selectedAPIMethod,
+			url: `${$idnSession.baseUrl}/${APICallPath}`,
+			data: requestContent.json,
+			headers: {
+				authorization: `Bearer ${$idnSession.accessToken}`
+			}
+		}).catch((err) => {
+			console.error(err);
+			return err;
+		});
+		responseContent = { text: undefined, json: response.data };
+		console.log(responseContent);
+	}
+
+	function handleKeydown(event: KeyboardEvent) {
+		console.log(event);
+
+		if (event.isTrusted === true && event.key === 'Enter') {
+			makeAPICall();
+		}
+	}
+
+	let APIVersions = [
+		//@ts-ignore
+		{ name: 'Beta', value: Object.entries(BetaSpec).map((path) => mapPath(path)) },
+		//@ts-ignore
+		{ name: 'V3', value: Object.entries(V3Spec).map((path) => mapPath(path)) },
+		//@ts-ignore
+		{ name: 'V2', value: Object.entries(V2Spec).map((path) => mapPath(path)) },
+		//@ts-ignore
+		{ name: 'CC', value: Object.entries(CCSpec).map((path) => mapPath(path)) },
+		{
+			name: 'Custom',
+			value: [
+				{
+					name: 'Custom Path',
+					value: { GET: '', POST: '', PUT: '', PATCH: '', DELETE: '', HEAD: '' }
+				}
+			]
+		}
+	];
 
 	let requestContent = {
 		text: undefined, // can be used to pass a stringified JSON document instead
-		json: {
-			request: 'All your base belong to us'
-		}
+		json: ''
 	};
 
 	let responseContent = {
 		text: undefined, // can be used to pass a stringified JSON document instead
-		json: {
-			response: 200
-		}
+		json: ''
 	};
 
-	let tabSet: number = 0;
+	let tabSet: number = 1;
 
-	$: methods = Object.entries(specification.paths[path] || { get: 'content' });
+	let selectedAPIVersion = APIVersions[0];
+	let selectedPath = selectedAPIVersion.value[0];
+
+	let APICallPath: string = `${selectedAPIVersion.name.toLowerCase()}${selectedPath.name}`;
+
+	let selectedAPIMethod = 'GET';
 </script>
 
 <div class="p-4 flex flex-col gap-4 h-full">
 	<div class="flex flex-row">
-		<select bind:value={specification} class="select w-fit rounded-r-none">
-			<option value={BetaSpec}>Beta API</option>
-			<option value={V3Spec}>V3 API</option>
-			<option value={CustomSpec}>Custom</option>
+		<select
+			placeholder="Select an API Version"
+			class="max-w-fit !rounded-r-none px-4 py-2 select"
+			bind:value={selectedAPIVersion}
+			on:change={() => {
+				selectedPath = selectedAPIVersion.value[0];
+				if (['Beta', 'V3', 'V2'].includes(selectedAPIVersion.name)) {
+					APICallPath = `${selectedAPIVersion.name.toLowerCase()}${selectedPath.name}`;
+				} else if (['CC'].includes(selectedAPIVersion.name)) {
+					APICallPath = `${selectedPath.name}`;
+				} else {
+					APICallPath = '';
+				}
+			}}
+		>
+			{#each APIVersions as APIVersion}
+				<option selected={selectedAPIVersion === APIVersion} value={APIVersion}>
+					{APIVersion.name}
+				</option>
+			{/each}
 		</select>
-		<select bind:value={path} class="select rounded-l-none">
-			{#each Object.entries(specification.paths) as [path, methods]}
-				<option value={path}>{path}</option>
+		<select
+			placeholder="Choose the API Endpoint"
+			class="!rounded-l-none px-4 select"
+			bind:value={selectedPath}
+			on:change={() => {
+				if (['Beta', 'V3', 'V2'].includes(selectedAPIVersion.name)) {
+					APICallPath = `${selectedAPIVersion.name.toLowerCase()}${selectedPath.name}`;
+				} else if (['CC'].includes(selectedAPIVersion.name)) {
+					APICallPath = `${selectedPath.name}`;
+				} else {
+					APICallPath = '';
+				}
+			}}
+		>
+			{#each selectedAPIVersion.value as path}
+				<option selected={path === selectedPath} value={path}>{path.name}</option>
 			{/each}
 		</select>
 	</div>
 	<div class="flex flex-row">
 		<select class="select rounded-r-none w-fit">
-			{#each methods as [method, content]}
+			{#each Object.entries(selectedPath.value) as [method, content]}
 				<option>{method.toUpperCase()}</option>
 			{/each}
 		</select>
-		<input bind:value={path} class="input rounded-l-none rounded-r-none pl-4" />
-		<button class="btn variant-filled-surface rounded-l-none rounded-r-lg">Call</button>
+		<input
+			type="text"
+			class="w-full !rounded-l-none rounded-r-none px-4 py-2 input"
+			bind:value={APICallPath}
+		/>
+		<button on:click={makeAPICall} class="btn variant-filled-surface rounded-l-none rounded-r-lg">
+			Call
+		</button>
 	</div>
+
 	<TabGroup justify="justify-center" class="grow">
 		<Tab bind:group={tabSet} name="tab1" value={0}>Request</Tab>
 		<Tab bind:group={tabSet} name="tab2" value={1}>Response</Tab>
 	</TabGroup>
+
 	{#if tabSet === 0}
 		<div class="jse-theme-dark h-full">
 			<JSONEditor bind:content={requestContent} />