diff --git a/how-to/register-with-home/public/common/views/contact/call-app/index.html b/how-to/register-with-home/public/common/views/contact/call-app/index.html
index e433b97bad..3637d0686b 100644
--- a/how-to/register-with-home/public/common/views/contact/call-app/index.html
+++ b/how-to/register-with-home/public/common/views/contact/call-app/index.html
@@ -6,6 +6,7 @@
 		<title>Call Application</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/register-with-home/public/common/views/contact/call-app/index.js b/how-to/register-with-home/public/common/views/contact/call-app/index.js
index f74c2b9fc9..7cd441c56a 100644
--- a/how-to/register-with-home/public/common/views/contact/call-app/index.js
+++ b/how-to/register-with-home/public/common/views/contact/call-app/index.js
@@ -104,24 +104,38 @@ function initializeDOM() {
 		await appChannel.broadcast(context);
 	}
 
-	if (window.fdc3 !== undefined) {
+	/**
+	 * Sets up the related fdc3 listeners once fdc3 is available.
+	 */
+	function setupListeners() {
 		const startCallIntent = 'StartCall';
 		const openAppIntent = 'OpenApp';
-		fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
-			updateCallInformation(ctx, startCallIntent);
-			return new Promise((resolve) => {
-				// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
-				resolve(ctx);
+		try {
+			fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
+				console.log('Received Context', ctx, metadata);
+				updateCallInformation(ctx);
 			});
-		});
-		fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
-			updateCallInformation(ctx, openAppIntent);
-		});
-		fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
-			console.log('Received Context', ctx, metadata);
-			updateCallInformation(ctx);
+			fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
+				updateCallInformation(ctx, startCallIntent);
+				return new Promise((resolve) => {
+					// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
+					resolve(ctx);
+				});
+			});
+			fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
+				updateCallInformation(ctx, openAppIntent);
+			});
+		} catch (error) {
+			console.error('Error setting up all of the fdc3 listeners', error);
+		}
+	}
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
 		});
 	}
 }
diff --git a/how-to/register-with-home/public/common/views/contact/common/contacts.js b/how-to/register-with-home/public/common/views/contact/common/contacts.js
index 2c9de045e1..37d14d7fb8 100644
--- a/how-to/register-with-home/public/common/views/contact/common/contacts.js
+++ b/how-to/register-with-home/public/common/views/contact/common/contacts.js
@@ -79,10 +79,17 @@ export function userToFdc3Context(user) {
  * @returns The custom settings from the manifest.
  */
 async function getManifestCustomSettings() {
-	// Get the manifest for the current application
-	const app = await fin.Application.getCurrent();
+	try {
+		if (window.fin) {
+			// Get the manifest for the current application
+			const app = await fin.Application.getCurrent();
 
-	// Extract the custom settings for this application
-	const manifest = await app.getManifest();
-	return manifest.customSettings ?? {};
+			// Extract the custom settings for this application
+			const manifest = await app.getManifest();
+			return manifest.customSettings ?? {};
+		}
+	} catch {
+		// not inside of an OpenFin container or there isn't app support.
+	}
+	return {};
 }
diff --git a/how-to/register-with-home/public/common/views/contact/investments-and-models/index.html b/how-to/register-with-home/public/common/views/contact/investments-and-models/index.html
index bb27b20a85..6eeea8e8fa 100644
--- a/how-to/register-with-home/public/common/views/contact/investments-and-models/index.html
+++ b/how-to/register-with-home/public/common/views/contact/investments-and-models/index.html
@@ -6,6 +6,7 @@
 		<title>Investments &amp; Models</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/register-with-home/public/common/views/contact/investments-and-models/index.js b/how-to/register-with-home/public/common/views/contact/investments-and-models/index.js
index 97359789b7..71f36524d5 100644
--- a/how-to/register-with-home/public/common/views/contact/investments-and-models/index.js
+++ b/how-to/register-with-home/public/common/views/contact/investments-and-models/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/register-with-home/public/common/views/contact/participant-history/index.html b/how-to/register-with-home/public/common/views/contact/participant-history/index.html
index 4c468baec6..9477f2e6fb 100644
--- a/how-to/register-with-home/public/common/views/contact/participant-history/index.html
+++ b/how-to/register-with-home/public/common/views/contact/participant-history/index.html
@@ -6,6 +6,7 @@
 		<title>Participant History</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/register-with-home/public/common/views/contact/participant-history/index.js b/how-to/register-with-home/public/common/views/contact/participant-history/index.js
index 75de7f400e..5835e9a94f 100644
--- a/how-to/register-with-home/public/common/views/contact/participant-history/index.js
+++ b/how-to/register-with-home/public/common/views/contact/participant-history/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/register-with-home/public/common/views/contact/participant-selection/index.html b/how-to/register-with-home/public/common/views/contact/participant-selection/index.html
index 02183eb297..e6994a9576 100644
--- a/how-to/register-with-home/public/common/views/contact/participant-selection/index.html
+++ b/how-to/register-with-home/public/common/views/contact/participant-selection/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Selection</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<style>
 			.profile-pic {
diff --git a/how-to/register-with-home/public/common/views/contact/participant-selection/index.js b/how-to/register-with-home/public/common/views/contact/participant-selection/index.js
index 7dce646b78..9b3c449ee8 100644
--- a/how-to/register-with-home/public/common/views/contact/participant-selection/index.js
+++ b/how-to/register-with-home/public/common/views/contact/participant-selection/index.js
@@ -6,83 +6,92 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  * Initialize the DOM.
  */
 async function initializeDOM() {
-	if (window.fdc3) {
-		await usersModule.initialize();
-
-		let hasViewContactIntentHandler = false;
-		try {
-			const info = await fin.me.interop.getInfoForIntent({
-				name: 'ViewContact'
-			});
-			if (info) {
-				hasViewContactIntentHandler = true;
-			}
-		} catch {}
-
-		if (!hasViewContactIntentHandler) {
-			console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	await usersModule.initialize();
+
+	let hasViewContactIntentHandler = false;
+	try {
+		const info = await fdc3.findIntent('ViewContact');
+		if (info) {
+			hasViewContactIntentHandler = true;
 		}
+	} catch {}
 
-		const users = usersModule.getUsers();
+	if (!hasViewContactIntentHandler) {
+		console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	}
 
-		const tbody = document.querySelector('tbody');
+	const users = usersModule.getUsers();
 
-		for (const user of users) {
-			const image = document.createElement('img');
-			image.src = usersModule.getProfilePic(user);
-			image.width = 28;
-			image.height = 28;
-			image.classList.add('profile-pic');
-			image.style.borderRadius = '5px';
+	const tbody = document.querySelector('tbody');
 
-			const imageCell = document.createElement('td');
-			imageCell.append(image);
+	for (const user of users) {
+		const image = document.createElement('img');
+		image.src = usersModule.getProfilePic(user);
+		image.width = 28;
+		image.height = 28;
+		image.classList.add('profile-pic');
+		image.style.borderRadius = '5px';
 
-			const dateCell = document.createElement('td');
-			dateCell.textContent = user.interactionDate;
+		const imageCell = document.createElement('td');
+		imageCell.append(image);
 
-			const nameCell = document.createElement('td');
-			nameCell.textContent = user.name;
+		const dateCell = document.createElement('td');
+		dateCell.textContent = user.interactionDate;
 
-			const emailCell = document.createElement('td');
-			emailCell.textContent = user.email;
+		const nameCell = document.createElement('td');
+		nameCell.textContent = user.name;
 
-			const typeCell = document.createElement('td');
-			typeCell.textContent = user.interactionType;
+		const emailCell = document.createElement('td');
+		emailCell.textContent = user.email;
 
-			const actionRow = document.createElement('div');
-			actionRow.classList.add('row');
-			actionRow.classList.add('gap10');
+		const typeCell = document.createElement('td');
+		typeCell.textContent = user.interactionType;
 
-			const actionCell = document.createElement('td');
-			actionCell.append(actionRow);
+		const actionRow = document.createElement('div');
+		actionRow.classList.add('row');
+		actionRow.classList.add('gap10');
 
-			const row = document.createElement('tr');
-			row.append(imageCell);
-			row.append(dateCell);
-			row.append(nameCell);
-			row.append(emailCell);
-			row.append(typeCell);
-			row.append(actionCell);
+		const actionCell = document.createElement('td');
+		actionCell.append(actionRow);
 
-			const selectButton = document.createElement('button');
-			selectButton.textContent = 'Select';
-			selectButton.classList.add('small');
-			selectButton.addEventListener('click', () => selectParticipant(user));
+		const row = document.createElement('tr');
+		row.append(imageCell);
+		row.append(dateCell);
+		row.append(nameCell);
+		row.append(emailCell);
+		row.append(typeCell);
+		row.append(actionCell);
 
-			actionRow.append(selectButton);
+		const selectButton = document.createElement('button');
+		selectButton.textContent = 'Select';
+		selectButton.classList.add('small');
+		selectButton.addEventListener('click', () => selectParticipant(user));
 
-			if (hasViewContactIntentHandler) {
-				const raiseIntentButton = document.createElement('button');
-				raiseIntentButton.textContent = 'Raise Intent';
-				raiseIntentButton.classList.add('small');
-				raiseIntentButton.classList.add('secondary');
-				raiseIntentButton.addEventListener('click', () => raiseIntent(user));
-				actionRow.append(raiseIntentButton);
-			}
+		actionRow.append(selectButton);
 
-			tbody.append(row);
+		if (hasViewContactIntentHandler) {
+			const raiseIntentButton = document.createElement('button');
+			raiseIntentButton.textContent = 'Raise Intent';
+			raiseIntentButton.classList.add('small');
+			raiseIntentButton.classList.add('secondary');
+			raiseIntentButton.addEventListener('click', () => raiseIntent(user));
+			actionRow.append(raiseIntentButton);
 		}
+
+		tbody.append(row);
 	}
 }
 
diff --git a/how-to/register-with-home/public/common/views/contact/participant-summary/index.html b/how-to/register-with-home/public/common/views/contact/participant-summary/index.html
index 9d81fbe6eb..6f9e2ccb95 100644
--- a/how-to/register-with-home/public/common/views/contact/participant-summary/index.html
+++ b/how-to/register-with-home/public/common/views/contact/participant-summary/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Summary</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<script type="module" src="../../../lib/wc-fin/wc-fin.esm.js"></script>
 		<style>
diff --git a/how-to/register-with-home/public/common/views/contact/participant-summary/index.js b/how-to/register-with-home/public/common/views/contact/participant-summary/index.js
index 942a86e4c2..c4909b1ad0 100644
--- a/how-to/register-with-home/public/common/views/contact/participant-summary/index.js
+++ b/how-to/register-with-home/public/common/views/contact/participant-summary/index.js
@@ -7,14 +7,30 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  */
 async function initializeDOM() {
 	const contextPicker = document.querySelector('#context-group-picker');
-	contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	if (window.fin) {
+		contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	}
+
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
 
-	if (window.fdc3) {
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	try {
 		await usersModule.initialize();
 
 		window.fdc3.addContextListener(contextHandler);
-
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/register-with-store/public/common/views/contact/call-app/index.html b/how-to/register-with-store/public/common/views/contact/call-app/index.html
index e433b97bad..3637d0686b 100644
--- a/how-to/register-with-store/public/common/views/contact/call-app/index.html
+++ b/how-to/register-with-store/public/common/views/contact/call-app/index.html
@@ -6,6 +6,7 @@
 		<title>Call Application</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/register-with-store/public/common/views/contact/call-app/index.js b/how-to/register-with-store/public/common/views/contact/call-app/index.js
index f74c2b9fc9..7cd441c56a 100644
--- a/how-to/register-with-store/public/common/views/contact/call-app/index.js
+++ b/how-to/register-with-store/public/common/views/contact/call-app/index.js
@@ -104,24 +104,38 @@ function initializeDOM() {
 		await appChannel.broadcast(context);
 	}
 
-	if (window.fdc3 !== undefined) {
+	/**
+	 * Sets up the related fdc3 listeners once fdc3 is available.
+	 */
+	function setupListeners() {
 		const startCallIntent = 'StartCall';
 		const openAppIntent = 'OpenApp';
-		fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
-			updateCallInformation(ctx, startCallIntent);
-			return new Promise((resolve) => {
-				// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
-				resolve(ctx);
+		try {
+			fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
+				console.log('Received Context', ctx, metadata);
+				updateCallInformation(ctx);
 			});
-		});
-		fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
-			updateCallInformation(ctx, openAppIntent);
-		});
-		fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
-			console.log('Received Context', ctx, metadata);
-			updateCallInformation(ctx);
+			fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
+				updateCallInformation(ctx, startCallIntent);
+				return new Promise((resolve) => {
+					// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
+					resolve(ctx);
+				});
+			});
+			fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
+				updateCallInformation(ctx, openAppIntent);
+			});
+		} catch (error) {
+			console.error('Error setting up all of the fdc3 listeners', error);
+		}
+	}
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
 		});
 	}
 }
diff --git a/how-to/register-with-store/public/common/views/contact/common/contacts.js b/how-to/register-with-store/public/common/views/contact/common/contacts.js
index 2c9de045e1..37d14d7fb8 100644
--- a/how-to/register-with-store/public/common/views/contact/common/contacts.js
+++ b/how-to/register-with-store/public/common/views/contact/common/contacts.js
@@ -79,10 +79,17 @@ export function userToFdc3Context(user) {
  * @returns The custom settings from the manifest.
  */
 async function getManifestCustomSettings() {
-	// Get the manifest for the current application
-	const app = await fin.Application.getCurrent();
+	try {
+		if (window.fin) {
+			// Get the manifest for the current application
+			const app = await fin.Application.getCurrent();
 
-	// Extract the custom settings for this application
-	const manifest = await app.getManifest();
-	return manifest.customSettings ?? {};
+			// Extract the custom settings for this application
+			const manifest = await app.getManifest();
+			return manifest.customSettings ?? {};
+		}
+	} catch {
+		// not inside of an OpenFin container or there isn't app support.
+	}
+	return {};
 }
diff --git a/how-to/register-with-store/public/common/views/contact/investments-and-models/index.html b/how-to/register-with-store/public/common/views/contact/investments-and-models/index.html
index bb27b20a85..6eeea8e8fa 100644
--- a/how-to/register-with-store/public/common/views/contact/investments-and-models/index.html
+++ b/how-to/register-with-store/public/common/views/contact/investments-and-models/index.html
@@ -6,6 +6,7 @@
 		<title>Investments &amp; Models</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/register-with-store/public/common/views/contact/investments-and-models/index.js b/how-to/register-with-store/public/common/views/contact/investments-and-models/index.js
index 97359789b7..71f36524d5 100644
--- a/how-to/register-with-store/public/common/views/contact/investments-and-models/index.js
+++ b/how-to/register-with-store/public/common/views/contact/investments-and-models/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/register-with-store/public/common/views/contact/participant-history/index.html b/how-to/register-with-store/public/common/views/contact/participant-history/index.html
index 4c468baec6..9477f2e6fb 100644
--- a/how-to/register-with-store/public/common/views/contact/participant-history/index.html
+++ b/how-to/register-with-store/public/common/views/contact/participant-history/index.html
@@ -6,6 +6,7 @@
 		<title>Participant History</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/register-with-store/public/common/views/contact/participant-history/index.js b/how-to/register-with-store/public/common/views/contact/participant-history/index.js
index 75de7f400e..5835e9a94f 100644
--- a/how-to/register-with-store/public/common/views/contact/participant-history/index.js
+++ b/how-to/register-with-store/public/common/views/contact/participant-history/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/register-with-store/public/common/views/contact/participant-selection/index.html b/how-to/register-with-store/public/common/views/contact/participant-selection/index.html
index 02183eb297..e6994a9576 100644
--- a/how-to/register-with-store/public/common/views/contact/participant-selection/index.html
+++ b/how-to/register-with-store/public/common/views/contact/participant-selection/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Selection</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<style>
 			.profile-pic {
diff --git a/how-to/register-with-store/public/common/views/contact/participant-selection/index.js b/how-to/register-with-store/public/common/views/contact/participant-selection/index.js
index 7dce646b78..9b3c449ee8 100644
--- a/how-to/register-with-store/public/common/views/contact/participant-selection/index.js
+++ b/how-to/register-with-store/public/common/views/contact/participant-selection/index.js
@@ -6,83 +6,92 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  * Initialize the DOM.
  */
 async function initializeDOM() {
-	if (window.fdc3) {
-		await usersModule.initialize();
-
-		let hasViewContactIntentHandler = false;
-		try {
-			const info = await fin.me.interop.getInfoForIntent({
-				name: 'ViewContact'
-			});
-			if (info) {
-				hasViewContactIntentHandler = true;
-			}
-		} catch {}
-
-		if (!hasViewContactIntentHandler) {
-			console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	await usersModule.initialize();
+
+	let hasViewContactIntentHandler = false;
+	try {
+		const info = await fdc3.findIntent('ViewContact');
+		if (info) {
+			hasViewContactIntentHandler = true;
 		}
+	} catch {}
 
-		const users = usersModule.getUsers();
+	if (!hasViewContactIntentHandler) {
+		console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	}
 
-		const tbody = document.querySelector('tbody');
+	const users = usersModule.getUsers();
 
-		for (const user of users) {
-			const image = document.createElement('img');
-			image.src = usersModule.getProfilePic(user);
-			image.width = 28;
-			image.height = 28;
-			image.classList.add('profile-pic');
-			image.style.borderRadius = '5px';
+	const tbody = document.querySelector('tbody');
 
-			const imageCell = document.createElement('td');
-			imageCell.append(image);
+	for (const user of users) {
+		const image = document.createElement('img');
+		image.src = usersModule.getProfilePic(user);
+		image.width = 28;
+		image.height = 28;
+		image.classList.add('profile-pic');
+		image.style.borderRadius = '5px';
 
-			const dateCell = document.createElement('td');
-			dateCell.textContent = user.interactionDate;
+		const imageCell = document.createElement('td');
+		imageCell.append(image);
 
-			const nameCell = document.createElement('td');
-			nameCell.textContent = user.name;
+		const dateCell = document.createElement('td');
+		dateCell.textContent = user.interactionDate;
 
-			const emailCell = document.createElement('td');
-			emailCell.textContent = user.email;
+		const nameCell = document.createElement('td');
+		nameCell.textContent = user.name;
 
-			const typeCell = document.createElement('td');
-			typeCell.textContent = user.interactionType;
+		const emailCell = document.createElement('td');
+		emailCell.textContent = user.email;
 
-			const actionRow = document.createElement('div');
-			actionRow.classList.add('row');
-			actionRow.classList.add('gap10');
+		const typeCell = document.createElement('td');
+		typeCell.textContent = user.interactionType;
 
-			const actionCell = document.createElement('td');
-			actionCell.append(actionRow);
+		const actionRow = document.createElement('div');
+		actionRow.classList.add('row');
+		actionRow.classList.add('gap10');
 
-			const row = document.createElement('tr');
-			row.append(imageCell);
-			row.append(dateCell);
-			row.append(nameCell);
-			row.append(emailCell);
-			row.append(typeCell);
-			row.append(actionCell);
+		const actionCell = document.createElement('td');
+		actionCell.append(actionRow);
 
-			const selectButton = document.createElement('button');
-			selectButton.textContent = 'Select';
-			selectButton.classList.add('small');
-			selectButton.addEventListener('click', () => selectParticipant(user));
+		const row = document.createElement('tr');
+		row.append(imageCell);
+		row.append(dateCell);
+		row.append(nameCell);
+		row.append(emailCell);
+		row.append(typeCell);
+		row.append(actionCell);
 
-			actionRow.append(selectButton);
+		const selectButton = document.createElement('button');
+		selectButton.textContent = 'Select';
+		selectButton.classList.add('small');
+		selectButton.addEventListener('click', () => selectParticipant(user));
 
-			if (hasViewContactIntentHandler) {
-				const raiseIntentButton = document.createElement('button');
-				raiseIntentButton.textContent = 'Raise Intent';
-				raiseIntentButton.classList.add('small');
-				raiseIntentButton.classList.add('secondary');
-				raiseIntentButton.addEventListener('click', () => raiseIntent(user));
-				actionRow.append(raiseIntentButton);
-			}
+		actionRow.append(selectButton);
 
-			tbody.append(row);
+		if (hasViewContactIntentHandler) {
+			const raiseIntentButton = document.createElement('button');
+			raiseIntentButton.textContent = 'Raise Intent';
+			raiseIntentButton.classList.add('small');
+			raiseIntentButton.classList.add('secondary');
+			raiseIntentButton.addEventListener('click', () => raiseIntent(user));
+			actionRow.append(raiseIntentButton);
 		}
+
+		tbody.append(row);
 	}
 }
 
diff --git a/how-to/register-with-store/public/common/views/contact/participant-summary/index.html b/how-to/register-with-store/public/common/views/contact/participant-summary/index.html
index 9d81fbe6eb..6f9e2ccb95 100644
--- a/how-to/register-with-store/public/common/views/contact/participant-summary/index.html
+++ b/how-to/register-with-store/public/common/views/contact/participant-summary/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Summary</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<script type="module" src="../../../lib/wc-fin/wc-fin.esm.js"></script>
 		<style>
diff --git a/how-to/register-with-store/public/common/views/contact/participant-summary/index.js b/how-to/register-with-store/public/common/views/contact/participant-summary/index.js
index 942a86e4c2..c4909b1ad0 100644
--- a/how-to/register-with-store/public/common/views/contact/participant-summary/index.js
+++ b/how-to/register-with-store/public/common/views/contact/participant-summary/index.js
@@ -7,14 +7,30 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  */
 async function initializeDOM() {
 	const contextPicker = document.querySelector('#context-group-picker');
-	contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	if (window.fin) {
+		contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	}
+
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
 
-	if (window.fdc3) {
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	try {
 		await usersModule.initialize();
 
 		window.fdc3.addContextListener(contextHandler);
-
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/support-context-and-intents/public/common/views/contact/call-app/index.html b/how-to/support-context-and-intents/public/common/views/contact/call-app/index.html
index e433b97bad..3637d0686b 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/call-app/index.html
+++ b/how-to/support-context-and-intents/public/common/views/contact/call-app/index.html
@@ -6,6 +6,7 @@
 		<title>Call Application</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/support-context-and-intents/public/common/views/contact/call-app/index.js b/how-to/support-context-and-intents/public/common/views/contact/call-app/index.js
index f74c2b9fc9..7cd441c56a 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/call-app/index.js
+++ b/how-to/support-context-and-intents/public/common/views/contact/call-app/index.js
@@ -104,24 +104,38 @@ function initializeDOM() {
 		await appChannel.broadcast(context);
 	}
 
-	if (window.fdc3 !== undefined) {
+	/**
+	 * Sets up the related fdc3 listeners once fdc3 is available.
+	 */
+	function setupListeners() {
 		const startCallIntent = 'StartCall';
 		const openAppIntent = 'OpenApp';
-		fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
-			updateCallInformation(ctx, startCallIntent);
-			return new Promise((resolve) => {
-				// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
-				resolve(ctx);
+		try {
+			fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
+				console.log('Received Context', ctx, metadata);
+				updateCallInformation(ctx);
 			});
-		});
-		fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
-			updateCallInformation(ctx, openAppIntent);
-		});
-		fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
-			console.log('Received Context', ctx, metadata);
-			updateCallInformation(ctx);
+			fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
+				updateCallInformation(ctx, startCallIntent);
+				return new Promise((resolve) => {
+					// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
+					resolve(ctx);
+				});
+			});
+			fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
+				updateCallInformation(ctx, openAppIntent);
+			});
+		} catch (error) {
+			console.error('Error setting up all of the fdc3 listeners', error);
+		}
+	}
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
 		});
 	}
 }
diff --git a/how-to/support-context-and-intents/public/common/views/contact/common/contacts.js b/how-to/support-context-and-intents/public/common/views/contact/common/contacts.js
index 2c9de045e1..37d14d7fb8 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/common/contacts.js
+++ b/how-to/support-context-and-intents/public/common/views/contact/common/contacts.js
@@ -79,10 +79,17 @@ export function userToFdc3Context(user) {
  * @returns The custom settings from the manifest.
  */
 async function getManifestCustomSettings() {
-	// Get the manifest for the current application
-	const app = await fin.Application.getCurrent();
+	try {
+		if (window.fin) {
+			// Get the manifest for the current application
+			const app = await fin.Application.getCurrent();
 
-	// Extract the custom settings for this application
-	const manifest = await app.getManifest();
-	return manifest.customSettings ?? {};
+			// Extract the custom settings for this application
+			const manifest = await app.getManifest();
+			return manifest.customSettings ?? {};
+		}
+	} catch {
+		// not inside of an OpenFin container or there isn't app support.
+	}
+	return {};
 }
diff --git a/how-to/support-context-and-intents/public/common/views/contact/investments-and-models/index.html b/how-to/support-context-and-intents/public/common/views/contact/investments-and-models/index.html
index bb27b20a85..6eeea8e8fa 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/investments-and-models/index.html
+++ b/how-to/support-context-and-intents/public/common/views/contact/investments-and-models/index.html
@@ -6,6 +6,7 @@
 		<title>Investments &amp; Models</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/support-context-and-intents/public/common/views/contact/investments-and-models/index.js b/how-to/support-context-and-intents/public/common/views/contact/investments-and-models/index.js
index 97359789b7..71f36524d5 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/investments-and-models/index.js
+++ b/how-to/support-context-and-intents/public/common/views/contact/investments-and-models/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/support-context-and-intents/public/common/views/contact/participant-history/index.html b/how-to/support-context-and-intents/public/common/views/contact/participant-history/index.html
index 4c468baec6..9477f2e6fb 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/participant-history/index.html
+++ b/how-to/support-context-and-intents/public/common/views/contact/participant-history/index.html
@@ -6,6 +6,7 @@
 		<title>Participant History</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/support-context-and-intents/public/common/views/contact/participant-history/index.js b/how-to/support-context-and-intents/public/common/views/contact/participant-history/index.js
index 75de7f400e..5835e9a94f 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/participant-history/index.js
+++ b/how-to/support-context-and-intents/public/common/views/contact/participant-history/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/support-context-and-intents/public/common/views/contact/participant-selection/index.html b/how-to/support-context-and-intents/public/common/views/contact/participant-selection/index.html
index 02183eb297..e6994a9576 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/participant-selection/index.html
+++ b/how-to/support-context-and-intents/public/common/views/contact/participant-selection/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Selection</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<style>
 			.profile-pic {
diff --git a/how-to/support-context-and-intents/public/common/views/contact/participant-selection/index.js b/how-to/support-context-and-intents/public/common/views/contact/participant-selection/index.js
index 7dce646b78..9b3c449ee8 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/participant-selection/index.js
+++ b/how-to/support-context-and-intents/public/common/views/contact/participant-selection/index.js
@@ -6,83 +6,92 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  * Initialize the DOM.
  */
 async function initializeDOM() {
-	if (window.fdc3) {
-		await usersModule.initialize();
-
-		let hasViewContactIntentHandler = false;
-		try {
-			const info = await fin.me.interop.getInfoForIntent({
-				name: 'ViewContact'
-			});
-			if (info) {
-				hasViewContactIntentHandler = true;
-			}
-		} catch {}
-
-		if (!hasViewContactIntentHandler) {
-			console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	await usersModule.initialize();
+
+	let hasViewContactIntentHandler = false;
+	try {
+		const info = await fdc3.findIntent('ViewContact');
+		if (info) {
+			hasViewContactIntentHandler = true;
 		}
+	} catch {}
 
-		const users = usersModule.getUsers();
+	if (!hasViewContactIntentHandler) {
+		console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	}
 
-		const tbody = document.querySelector('tbody');
+	const users = usersModule.getUsers();
 
-		for (const user of users) {
-			const image = document.createElement('img');
-			image.src = usersModule.getProfilePic(user);
-			image.width = 28;
-			image.height = 28;
-			image.classList.add('profile-pic');
-			image.style.borderRadius = '5px';
+	const tbody = document.querySelector('tbody');
 
-			const imageCell = document.createElement('td');
-			imageCell.append(image);
+	for (const user of users) {
+		const image = document.createElement('img');
+		image.src = usersModule.getProfilePic(user);
+		image.width = 28;
+		image.height = 28;
+		image.classList.add('profile-pic');
+		image.style.borderRadius = '5px';
 
-			const dateCell = document.createElement('td');
-			dateCell.textContent = user.interactionDate;
+		const imageCell = document.createElement('td');
+		imageCell.append(image);
 
-			const nameCell = document.createElement('td');
-			nameCell.textContent = user.name;
+		const dateCell = document.createElement('td');
+		dateCell.textContent = user.interactionDate;
 
-			const emailCell = document.createElement('td');
-			emailCell.textContent = user.email;
+		const nameCell = document.createElement('td');
+		nameCell.textContent = user.name;
 
-			const typeCell = document.createElement('td');
-			typeCell.textContent = user.interactionType;
+		const emailCell = document.createElement('td');
+		emailCell.textContent = user.email;
 
-			const actionRow = document.createElement('div');
-			actionRow.classList.add('row');
-			actionRow.classList.add('gap10');
+		const typeCell = document.createElement('td');
+		typeCell.textContent = user.interactionType;
 
-			const actionCell = document.createElement('td');
-			actionCell.append(actionRow);
+		const actionRow = document.createElement('div');
+		actionRow.classList.add('row');
+		actionRow.classList.add('gap10');
 
-			const row = document.createElement('tr');
-			row.append(imageCell);
-			row.append(dateCell);
-			row.append(nameCell);
-			row.append(emailCell);
-			row.append(typeCell);
-			row.append(actionCell);
+		const actionCell = document.createElement('td');
+		actionCell.append(actionRow);
 
-			const selectButton = document.createElement('button');
-			selectButton.textContent = 'Select';
-			selectButton.classList.add('small');
-			selectButton.addEventListener('click', () => selectParticipant(user));
+		const row = document.createElement('tr');
+		row.append(imageCell);
+		row.append(dateCell);
+		row.append(nameCell);
+		row.append(emailCell);
+		row.append(typeCell);
+		row.append(actionCell);
 
-			actionRow.append(selectButton);
+		const selectButton = document.createElement('button');
+		selectButton.textContent = 'Select';
+		selectButton.classList.add('small');
+		selectButton.addEventListener('click', () => selectParticipant(user));
 
-			if (hasViewContactIntentHandler) {
-				const raiseIntentButton = document.createElement('button');
-				raiseIntentButton.textContent = 'Raise Intent';
-				raiseIntentButton.classList.add('small');
-				raiseIntentButton.classList.add('secondary');
-				raiseIntentButton.addEventListener('click', () => raiseIntent(user));
-				actionRow.append(raiseIntentButton);
-			}
+		actionRow.append(selectButton);
 
-			tbody.append(row);
+		if (hasViewContactIntentHandler) {
+			const raiseIntentButton = document.createElement('button');
+			raiseIntentButton.textContent = 'Raise Intent';
+			raiseIntentButton.classList.add('small');
+			raiseIntentButton.classList.add('secondary');
+			raiseIntentButton.addEventListener('click', () => raiseIntent(user));
+			actionRow.append(raiseIntentButton);
 		}
+
+		tbody.append(row);
 	}
 }
 
diff --git a/how-to/support-context-and-intents/public/common/views/contact/participant-summary/index.html b/how-to/support-context-and-intents/public/common/views/contact/participant-summary/index.html
index 9d81fbe6eb..6f9e2ccb95 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/participant-summary/index.html
+++ b/how-to/support-context-and-intents/public/common/views/contact/participant-summary/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Summary</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<script type="module" src="../../../lib/wc-fin/wc-fin.esm.js"></script>
 		<style>
diff --git a/how-to/support-context-and-intents/public/common/views/contact/participant-summary/index.js b/how-to/support-context-and-intents/public/common/views/contact/participant-summary/index.js
index 942a86e4c2..c4909b1ad0 100644
--- a/how-to/support-context-and-intents/public/common/views/contact/participant-summary/index.js
+++ b/how-to/support-context-and-intents/public/common/views/contact/participant-summary/index.js
@@ -7,14 +7,30 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  */
 async function initializeDOM() {
 	const contextPicker = document.querySelector('#context-group-picker');
-	contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	if (window.fin) {
+		contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	}
+
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
 
-	if (window.fdc3) {
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	try {
 		await usersModule.initialize();
 
 		window.fdc3.addContextListener(contextHandler);
-
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/call-app/index.html b/how-to/workspace-platform-starter-basic/public/common/views/contact/call-app/index.html
index e433b97bad..3637d0686b 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/call-app/index.html
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/call-app/index.html
@@ -6,6 +6,7 @@
 		<title>Call Application</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/call-app/index.js b/how-to/workspace-platform-starter-basic/public/common/views/contact/call-app/index.js
index f74c2b9fc9..7cd441c56a 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/call-app/index.js
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/call-app/index.js
@@ -104,24 +104,38 @@ function initializeDOM() {
 		await appChannel.broadcast(context);
 	}
 
-	if (window.fdc3 !== undefined) {
+	/**
+	 * Sets up the related fdc3 listeners once fdc3 is available.
+	 */
+	function setupListeners() {
 		const startCallIntent = 'StartCall';
 		const openAppIntent = 'OpenApp';
-		fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
-			updateCallInformation(ctx, startCallIntent);
-			return new Promise((resolve) => {
-				// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
-				resolve(ctx);
+		try {
+			fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
+				console.log('Received Context', ctx, metadata);
+				updateCallInformation(ctx);
 			});
-		});
-		fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
-			updateCallInformation(ctx, openAppIntent);
-		});
-		fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
-			console.log('Received Context', ctx, metadata);
-			updateCallInformation(ctx);
+			fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
+				updateCallInformation(ctx, startCallIntent);
+				return new Promise((resolve) => {
+					// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
+					resolve(ctx);
+				});
+			});
+			fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
+				updateCallInformation(ctx, openAppIntent);
+			});
+		} catch (error) {
+			console.error('Error setting up all of the fdc3 listeners', error);
+		}
+	}
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
 		});
 	}
 }
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/common/contacts.js b/how-to/workspace-platform-starter-basic/public/common/views/contact/common/contacts.js
index 2c9de045e1..37d14d7fb8 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/common/contacts.js
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/common/contacts.js
@@ -79,10 +79,17 @@ export function userToFdc3Context(user) {
  * @returns The custom settings from the manifest.
  */
 async function getManifestCustomSettings() {
-	// Get the manifest for the current application
-	const app = await fin.Application.getCurrent();
+	try {
+		if (window.fin) {
+			// Get the manifest for the current application
+			const app = await fin.Application.getCurrent();
 
-	// Extract the custom settings for this application
-	const manifest = await app.getManifest();
-	return manifest.customSettings ?? {};
+			// Extract the custom settings for this application
+			const manifest = await app.getManifest();
+			return manifest.customSettings ?? {};
+		}
+	} catch {
+		// not inside of an OpenFin container or there isn't app support.
+	}
+	return {};
 }
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/investments-and-models/index.html b/how-to/workspace-platform-starter-basic/public/common/views/contact/investments-and-models/index.html
index bb27b20a85..6eeea8e8fa 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/investments-and-models/index.html
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/investments-and-models/index.html
@@ -6,6 +6,7 @@
 		<title>Investments &amp; Models</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/investments-and-models/index.js b/how-to/workspace-platform-starter-basic/public/common/views/contact/investments-and-models/index.js
index 97359789b7..71f36524d5 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/investments-and-models/index.js
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/investments-and-models/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-history/index.html b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-history/index.html
index 4c468baec6..9477f2e6fb 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-history/index.html
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-history/index.html
@@ -6,6 +6,7 @@
 		<title>Participant History</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-history/index.js b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-history/index.js
index 75de7f400e..5835e9a94f 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-history/index.js
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-history/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-selection/index.html b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-selection/index.html
index 02183eb297..e6994a9576 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-selection/index.html
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-selection/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Selection</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<style>
 			.profile-pic {
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-selection/index.js b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-selection/index.js
index 7dce646b78..9b3c449ee8 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-selection/index.js
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-selection/index.js
@@ -6,83 +6,92 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  * Initialize the DOM.
  */
 async function initializeDOM() {
-	if (window.fdc3) {
-		await usersModule.initialize();
-
-		let hasViewContactIntentHandler = false;
-		try {
-			const info = await fin.me.interop.getInfoForIntent({
-				name: 'ViewContact'
-			});
-			if (info) {
-				hasViewContactIntentHandler = true;
-			}
-		} catch {}
-
-		if (!hasViewContactIntentHandler) {
-			console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	await usersModule.initialize();
+
+	let hasViewContactIntentHandler = false;
+	try {
+		const info = await fdc3.findIntent('ViewContact');
+		if (info) {
+			hasViewContactIntentHandler = true;
 		}
+	} catch {}
 
-		const users = usersModule.getUsers();
+	if (!hasViewContactIntentHandler) {
+		console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	}
 
-		const tbody = document.querySelector('tbody');
+	const users = usersModule.getUsers();
 
-		for (const user of users) {
-			const image = document.createElement('img');
-			image.src = usersModule.getProfilePic(user);
-			image.width = 28;
-			image.height = 28;
-			image.classList.add('profile-pic');
-			image.style.borderRadius = '5px';
+	const tbody = document.querySelector('tbody');
 
-			const imageCell = document.createElement('td');
-			imageCell.append(image);
+	for (const user of users) {
+		const image = document.createElement('img');
+		image.src = usersModule.getProfilePic(user);
+		image.width = 28;
+		image.height = 28;
+		image.classList.add('profile-pic');
+		image.style.borderRadius = '5px';
 
-			const dateCell = document.createElement('td');
-			dateCell.textContent = user.interactionDate;
+		const imageCell = document.createElement('td');
+		imageCell.append(image);
 
-			const nameCell = document.createElement('td');
-			nameCell.textContent = user.name;
+		const dateCell = document.createElement('td');
+		dateCell.textContent = user.interactionDate;
 
-			const emailCell = document.createElement('td');
-			emailCell.textContent = user.email;
+		const nameCell = document.createElement('td');
+		nameCell.textContent = user.name;
 
-			const typeCell = document.createElement('td');
-			typeCell.textContent = user.interactionType;
+		const emailCell = document.createElement('td');
+		emailCell.textContent = user.email;
 
-			const actionRow = document.createElement('div');
-			actionRow.classList.add('row');
-			actionRow.classList.add('gap10');
+		const typeCell = document.createElement('td');
+		typeCell.textContent = user.interactionType;
 
-			const actionCell = document.createElement('td');
-			actionCell.append(actionRow);
+		const actionRow = document.createElement('div');
+		actionRow.classList.add('row');
+		actionRow.classList.add('gap10');
 
-			const row = document.createElement('tr');
-			row.append(imageCell);
-			row.append(dateCell);
-			row.append(nameCell);
-			row.append(emailCell);
-			row.append(typeCell);
-			row.append(actionCell);
+		const actionCell = document.createElement('td');
+		actionCell.append(actionRow);
 
-			const selectButton = document.createElement('button');
-			selectButton.textContent = 'Select';
-			selectButton.classList.add('small');
-			selectButton.addEventListener('click', () => selectParticipant(user));
+		const row = document.createElement('tr');
+		row.append(imageCell);
+		row.append(dateCell);
+		row.append(nameCell);
+		row.append(emailCell);
+		row.append(typeCell);
+		row.append(actionCell);
 
-			actionRow.append(selectButton);
+		const selectButton = document.createElement('button');
+		selectButton.textContent = 'Select';
+		selectButton.classList.add('small');
+		selectButton.addEventListener('click', () => selectParticipant(user));
 
-			if (hasViewContactIntentHandler) {
-				const raiseIntentButton = document.createElement('button');
-				raiseIntentButton.textContent = 'Raise Intent';
-				raiseIntentButton.classList.add('small');
-				raiseIntentButton.classList.add('secondary');
-				raiseIntentButton.addEventListener('click', () => raiseIntent(user));
-				actionRow.append(raiseIntentButton);
-			}
+		actionRow.append(selectButton);
 
-			tbody.append(row);
+		if (hasViewContactIntentHandler) {
+			const raiseIntentButton = document.createElement('button');
+			raiseIntentButton.textContent = 'Raise Intent';
+			raiseIntentButton.classList.add('small');
+			raiseIntentButton.classList.add('secondary');
+			raiseIntentButton.addEventListener('click', () => raiseIntent(user));
+			actionRow.append(raiseIntentButton);
 		}
+
+		tbody.append(row);
 	}
 }
 
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-summary/index.html b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-summary/index.html
index 9d81fbe6eb..6f9e2ccb95 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-summary/index.html
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-summary/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Summary</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<script type="module" src="../../../lib/wc-fin/wc-fin.esm.js"></script>
 		<style>
diff --git a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-summary/index.js b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-summary/index.js
index 942a86e4c2..c4909b1ad0 100644
--- a/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-summary/index.js
+++ b/how-to/workspace-platform-starter-basic/public/common/views/contact/participant-summary/index.js
@@ -7,14 +7,30 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  */
 async function initializeDOM() {
 	const contextPicker = document.querySelector('#context-group-picker');
-	contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	if (window.fin) {
+		contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	}
+
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
 
-	if (window.fdc3) {
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	try {
 		await usersModule.initialize();
 
 		window.fdc3.addContextListener(contextHandler);
-
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/workspace-platform-starter/CHANGELOG.md b/how-to/workspace-platform-starter/CHANGELOG.md
index c2dc730a5f..81a8badeba 100644
--- a/how-to/workspace-platform-starter/CHANGELOG.md
+++ b/how-to/workspace-platform-starter/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## v18.0.0
 
+- Added example of supporting workspace and desktop browser (through openfin/core-web as part of OpenFin anywhere) to our contact and manager portal examples in public/common by importing the fin/fdc3 api if it is not available (will require being rendered in an OpenFin Web Layout: <https://github.com/built-on-openfin/web-starter/tree/web/v18.0.0>).
 - More efficient validation of appIds associated with views/windows for faster interop based actions. The appId validation in our wps module (modules directory) has extracted into its own file and tests to ensure it continues to behave as expected across future updates have been added to the test directory.
 - Module Helpers now provide a getAnalyticsClient (it is marked as optional and the result could be undefined so it leaves the option for it to be denied to a module or removed). This client supports a ModuleAnalytic event which will have a source of Module assigned to it (you can still specify type and use the data property to provide additional module specific information). This data will be passed to the analyticProviders that receive the Workspace Analytic events. See [How to Configure Analytics](./docs/how-to-configure-analytics.md).
 - Added a cloud interop override module so that you can easily test out OpenFin's cloud interop offering. See [How To Add Cloud Interop To Your Interop Broker](./docs/how-to-add-cloud-interop-to-your-interop-broker.md).
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/call-app/index.html b/how-to/workspace-platform-starter/public/common/views/contact/call-app/index.html
index e433b97bad..3637d0686b 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/call-app/index.html
+++ b/how-to/workspace-platform-starter/public/common/views/contact/call-app/index.html
@@ -6,6 +6,7 @@
 		<title>Call Application</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/call-app/index.js b/how-to/workspace-platform-starter/public/common/views/contact/call-app/index.js
index f74c2b9fc9..7cd441c56a 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/call-app/index.js
+++ b/how-to/workspace-platform-starter/public/common/views/contact/call-app/index.js
@@ -104,24 +104,38 @@ function initializeDOM() {
 		await appChannel.broadcast(context);
 	}
 
-	if (window.fdc3 !== undefined) {
+	/**
+	 * Sets up the related fdc3 listeners once fdc3 is available.
+	 */
+	function setupListeners() {
 		const startCallIntent = 'StartCall';
 		const openAppIntent = 'OpenApp';
-		fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
-			updateCallInformation(ctx, startCallIntent);
-			return new Promise((resolve) => {
-				// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
-				resolve(ctx);
+		try {
+			fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
+				console.log('Received Context', ctx, metadata);
+				updateCallInformation(ctx);
 			});
-		});
-		fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
-			console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
-			updateCallInformation(ctx, openAppIntent);
-		});
-		fdc3.addContextListener('fdc3.contact', (ctx, metadata) => {
-			console.log('Received Context', ctx, metadata);
-			updateCallInformation(ctx);
+			fdc3.addIntentListener(startCallIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${startCallIntent}`, ctx, metadata);
+				updateCallInformation(ctx, startCallIntent);
+				return new Promise((resolve) => {
+					// To demonstrate getResult in fdc3 2.0 we simply return the context that was sent.
+					resolve(ctx);
+				});
+			});
+			fdc3.addIntentListener(openAppIntent, (ctx, metadata) => {
+				console.log(`Received Context For Intent: ${openAppIntent}`, ctx, metadata);
+				updateCallInformation(ctx, openAppIntent);
+			});
+		} catch (error) {
+			console.error('Error setting up all of the fdc3 listeners', error);
+		}
+	}
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
 		});
 	}
 }
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/common/contacts.js b/how-to/workspace-platform-starter/public/common/views/contact/common/contacts.js
index 2c9de045e1..37d14d7fb8 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/common/contacts.js
+++ b/how-to/workspace-platform-starter/public/common/views/contact/common/contacts.js
@@ -79,10 +79,17 @@ export function userToFdc3Context(user) {
  * @returns The custom settings from the manifest.
  */
 async function getManifestCustomSettings() {
-	// Get the manifest for the current application
-	const app = await fin.Application.getCurrent();
+	try {
+		if (window.fin) {
+			// Get the manifest for the current application
+			const app = await fin.Application.getCurrent();
 
-	// Extract the custom settings for this application
-	const manifest = await app.getManifest();
-	return manifest.customSettings ?? {};
+			// Extract the custom settings for this application
+			const manifest = await app.getManifest();
+			return manifest.customSettings ?? {};
+		}
+	} catch {
+		// not inside of an OpenFin container or there isn't app support.
+	}
+	return {};
 }
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/investments-and-models/index.html b/how-to/workspace-platform-starter/public/common/views/contact/investments-and-models/index.html
index bb27b20a85..6eeea8e8fa 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/investments-and-models/index.html
+++ b/how-to/workspace-platform-starter/public/common/views/contact/investments-and-models/index.html
@@ -6,6 +6,7 @@
 		<title>Investments &amp; Models</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/investments-and-models/index.js b/how-to/workspace-platform-starter/public/common/views/contact/investments-and-models/index.js
index 97359789b7..71f36524d5 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/investments-and-models/index.js
+++ b/how-to/workspace-platform-starter/public/common/views/contact/investments-and-models/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/participant-history/index.html b/how-to/workspace-platform-starter/public/common/views/contact/participant-history/index.html
index 4c468baec6..9477f2e6fb 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/participant-history/index.html
+++ b/how-to/workspace-platform-starter/public/common/views/contact/participant-history/index.html
@@ -6,6 +6,7 @@
 		<title>Participant History</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js"></script>
 	</head>
 
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/participant-history/index.js b/how-to/workspace-platform-starter/public/common/views/contact/participant-history/index.js
index 75de7f400e..5835e9a94f 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/participant-history/index.js
+++ b/how-to/workspace-platform-starter/public/common/views/contact/participant-history/index.js
@@ -2,9 +2,24 @@
  * Initialize the DOM.
  */
 function initializeDOM() {
-	if (window.fdc3) {
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+function setupListeners() {
+	try {
 		window.fdc3.addContextListener(contextHandler);
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/participant-selection/index.html b/how-to/workspace-platform-starter/public/common/views/contact/participant-selection/index.html
index 02183eb297..e6994a9576 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/participant-selection/index.html
+++ b/how-to/workspace-platform-starter/public/common/views/contact/participant-selection/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Selection</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<style>
 			.profile-pic {
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/participant-selection/index.js b/how-to/workspace-platform-starter/public/common/views/contact/participant-selection/index.js
index 7dce646b78..9b3c449ee8 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/participant-selection/index.js
+++ b/how-to/workspace-platform-starter/public/common/views/contact/participant-selection/index.js
@@ -6,83 +6,92 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  * Initialize the DOM.
  */
 async function initializeDOM() {
-	if (window.fdc3) {
-		await usersModule.initialize();
-
-		let hasViewContactIntentHandler = false;
-		try {
-			const info = await fin.me.interop.getInfoForIntent({
-				name: 'ViewContact'
-			});
-			if (info) {
-				hasViewContactIntentHandler = true;
-			}
-		} catch {}
-
-		if (!hasViewContactIntentHandler) {
-			console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
+
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	await usersModule.initialize();
+
+	let hasViewContactIntentHandler = false;
+	try {
+		const info = await fdc3.findIntent('ViewContact');
+		if (info) {
+			hasViewContactIntentHandler = true;
 		}
+	} catch {}
 
-		const users = usersModule.getUsers();
+	if (!hasViewContactIntentHandler) {
+		console.warn('No ViewContact intent handler is available, will not show Raise Intent button');
+	}
 
-		const tbody = document.querySelector('tbody');
+	const users = usersModule.getUsers();
 
-		for (const user of users) {
-			const image = document.createElement('img');
-			image.src = usersModule.getProfilePic(user);
-			image.width = 28;
-			image.height = 28;
-			image.classList.add('profile-pic');
-			image.style.borderRadius = '5px';
+	const tbody = document.querySelector('tbody');
 
-			const imageCell = document.createElement('td');
-			imageCell.append(image);
+	for (const user of users) {
+		const image = document.createElement('img');
+		image.src = usersModule.getProfilePic(user);
+		image.width = 28;
+		image.height = 28;
+		image.classList.add('profile-pic');
+		image.style.borderRadius = '5px';
 
-			const dateCell = document.createElement('td');
-			dateCell.textContent = user.interactionDate;
+		const imageCell = document.createElement('td');
+		imageCell.append(image);
 
-			const nameCell = document.createElement('td');
-			nameCell.textContent = user.name;
+		const dateCell = document.createElement('td');
+		dateCell.textContent = user.interactionDate;
 
-			const emailCell = document.createElement('td');
-			emailCell.textContent = user.email;
+		const nameCell = document.createElement('td');
+		nameCell.textContent = user.name;
 
-			const typeCell = document.createElement('td');
-			typeCell.textContent = user.interactionType;
+		const emailCell = document.createElement('td');
+		emailCell.textContent = user.email;
 
-			const actionRow = document.createElement('div');
-			actionRow.classList.add('row');
-			actionRow.classList.add('gap10');
+		const typeCell = document.createElement('td');
+		typeCell.textContent = user.interactionType;
 
-			const actionCell = document.createElement('td');
-			actionCell.append(actionRow);
+		const actionRow = document.createElement('div');
+		actionRow.classList.add('row');
+		actionRow.classList.add('gap10');
 
-			const row = document.createElement('tr');
-			row.append(imageCell);
-			row.append(dateCell);
-			row.append(nameCell);
-			row.append(emailCell);
-			row.append(typeCell);
-			row.append(actionCell);
+		const actionCell = document.createElement('td');
+		actionCell.append(actionRow);
 
-			const selectButton = document.createElement('button');
-			selectButton.textContent = 'Select';
-			selectButton.classList.add('small');
-			selectButton.addEventListener('click', () => selectParticipant(user));
+		const row = document.createElement('tr');
+		row.append(imageCell);
+		row.append(dateCell);
+		row.append(nameCell);
+		row.append(emailCell);
+		row.append(typeCell);
+		row.append(actionCell);
 
-			actionRow.append(selectButton);
+		const selectButton = document.createElement('button');
+		selectButton.textContent = 'Select';
+		selectButton.classList.add('small');
+		selectButton.addEventListener('click', () => selectParticipant(user));
 
-			if (hasViewContactIntentHandler) {
-				const raiseIntentButton = document.createElement('button');
-				raiseIntentButton.textContent = 'Raise Intent';
-				raiseIntentButton.classList.add('small');
-				raiseIntentButton.classList.add('secondary');
-				raiseIntentButton.addEventListener('click', () => raiseIntent(user));
-				actionRow.append(raiseIntentButton);
-			}
+		actionRow.append(selectButton);
 
-			tbody.append(row);
+		if (hasViewContactIntentHandler) {
+			const raiseIntentButton = document.createElement('button');
+			raiseIntentButton.textContent = 'Raise Intent';
+			raiseIntentButton.classList.add('small');
+			raiseIntentButton.classList.add('secondary');
+			raiseIntentButton.addEventListener('click', () => raiseIntent(user));
+			actionRow.append(raiseIntentButton);
 		}
+
+		tbody.append(row);
 	}
 }
 
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/participant-summary/index.html b/how-to/workspace-platform-starter/public/common/views/contact/participant-summary/index.html
index 9d81fbe6eb..6f9e2ccb95 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/participant-summary/index.html
+++ b/how-to/workspace-platform-starter/public/common/views/contact/participant-summary/index.html
@@ -6,6 +6,7 @@
 		<title>Participant Summary</title>
 		<link rel="icon" type="image/x-icon" href="../../../../favicon.ico" />
 		<link rel="stylesheet" href="../../../style/app.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 		<script defer="defer" src="./index.js" type="module"></script>
 		<script type="module" src="../../../lib/wc-fin/wc-fin.esm.js"></script>
 		<style>
diff --git a/how-to/workspace-platform-starter/public/common/views/contact/participant-summary/index.js b/how-to/workspace-platform-starter/public/common/views/contact/participant-summary/index.js
index 942a86e4c2..c4909b1ad0 100644
--- a/how-to/workspace-platform-starter/public/common/views/contact/participant-summary/index.js
+++ b/how-to/workspace-platform-starter/public/common/views/contact/participant-summary/index.js
@@ -7,14 +7,30 @@ window.addEventListener('DOMContentLoaded', initializeDOM);
  */
 async function initializeDOM() {
 	const contextPicker = document.querySelector('#context-group-picker');
-	contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	if (window.fin) {
+		contextPicker.style.display = fin.me.isWindow ? 'block' : 'none';
+	}
+
+	if (window.fdc3 !== undefined) {
+		setupListeners();
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			setupListeners();
+		});
+	}
+}
 
-	if (window.fdc3) {
+/**
+ * Sets up the related fdc3 listeners once fdc3 is available.
+ */
+async function setupListeners() {
+	try {
 		await usersModule.initialize();
 
 		window.fdc3.addContextListener(contextHandler);
-
 		window.fdc3.addIntentListener('ViewContact', contextHandler);
+	} catch (error) {
+		console.error('There was an error while setting up all of the fdc3 listeners', error);
 	}
 }
 
diff --git a/how-to/workspace-platform-starter/public/common/views/manager-portal/common/common.js b/how-to/workspace-platform-starter/public/common/views/manager-portal/common/common.js
index 9acd236f62..14d48ae29e 100644
--- a/how-to/workspace-platform-starter/public/common/views/manager-portal/common/common.js
+++ b/how-to/workspace-platform-starter/public/common/views/manager-portal/common/common.js
@@ -117,6 +117,11 @@ export async function initFdc3Listener(contextHandler) {
 	if (window.fdc3 !== undefined) {
 		// add a listener
 		window.fdc3.addContextListener(contextHandler);
+	} else {
+		window.addEventListener('fdc3Ready', async () => {
+			// add a listener
+			window.fdc3.addContextListener(contextHandler);
+		});
 	}
 }
 
diff --git a/how-to/workspace-platform-starter/public/common/views/manager-portal/common/contacts.js b/how-to/workspace-platform-starter/public/common/views/manager-portal/common/contacts.js
index 2c9de045e1..356665220a 100644
--- a/how-to/workspace-platform-starter/public/common/views/manager-portal/common/contacts.js
+++ b/how-to/workspace-platform-starter/public/common/views/manager-portal/common/contacts.js
@@ -79,10 +79,17 @@ export function userToFdc3Context(user) {
  * @returns The custom settings from the manifest.
  */
 async function getManifestCustomSettings() {
-	// Get the manifest for the current application
-	const app = await fin.Application.getCurrent();
+	try {
+		if (window.fin) {
+			// Get the manifest for the current application
+			const app = await fin.Application.getCurrent();
 
-	// Extract the custom settings for this application
-	const manifest = await app.getManifest();
-	return manifest.customSettings ?? {};
+			// Extract the custom settings for this application
+			const manifest = await app.getManifest();
+			return manifest.customSettings ?? {};
+		}
+	} catch {
+		// not in an OpenFin container.
+	}
+	return {};
 }
diff --git a/how-to/workspace-platform-starter/public/common/views/manager-portal/manager-paths/index.html b/how-to/workspace-platform-starter/public/common/views/manager-portal/manager-paths/index.html
index 5112650371..6ff4d6d0c6 100644
--- a/how-to/workspace-platform-starter/public/common/views/manager-portal/manager-paths/index.html
+++ b/how-to/workspace-platform-starter/public/common/views/manager-portal/manager-paths/index.html
@@ -13,6 +13,7 @@
 		/>
 	</head>
 	<link rel="stylesheet" href="../common/style.css" />
+	<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
 	<script type="module" src="./index.js"></script>
 
 	<body>
diff --git a/how-to/workspace-platform-starter/public/common/views/manager-portal/manager-paths/index.js b/how-to/workspace-platform-starter/public/common/views/manager-portal/manager-paths/index.js
index 28f7c173b9..63cd14940f 100644
--- a/how-to/workspace-platform-starter/public/common/views/manager-portal/manager-paths/index.js
+++ b/how-to/workspace-platform-starter/public/common/views/manager-portal/manager-paths/index.js
@@ -21,8 +21,10 @@ document.addEventListener('DOMContentLoaded', async () => {
  */
 function initDom() {
 	document.querySelector('#btnReview').addEventListener('click', async () => {
-		const plat = fin.Platform.getCurrentSync();
-		await plat.createView({ target: null, url: 'https://www.expensify.com/reports' });
+		if (window.fin) {
+			const plat = fin.Platform.getCurrentSync();
+			await plat.createView({ target: null, url: 'https://www.expensify.com/reports' });
+		}
 	});
 }
 
diff --git a/how-to/workspace-platform-starter/public/common/views/manager-portal/my-team/index.html b/how-to/workspace-platform-starter/public/common/views/manager-portal/my-team/index.html
index 8a96709c7f..9798c0fc9a 100644
--- a/how-to/workspace-platform-starter/public/common/views/manager-portal/my-team/index.html
+++ b/how-to/workspace-platform-starter/public/common/views/manager-portal/my-team/index.html
@@ -11,10 +11,10 @@
 			href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&amp;display=swap"
 			rel="stylesheet"
 		/>
+		<link rel="stylesheet" href="../common/style.css" />
+		<script src="https://built-on-openfin.github.io/web-starter/web/v18.0.0/web-client-api/js/shim.api.bundle.js"></script>
+		<script type="module" src="./index.js"></script>
 	</head>
-	<link rel="stylesheet" href="../common/style.css" />
-	<script type="module" src="./index.js"></script>
-
 	<body class="scroll-vertical">
 		<div class="col team-member-list fill"></div>
 	</body>