diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 71477ca2..56a1c574 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -166,9 +166,8 @@ export default {
             const store = useMainStore();
             const currentPageName = this.getPageNameByQueryString();
             const universes = store.applicationUser.experiments;
-            const deviceId = getDeviceIdValue(); // cookieNames.DXDEV
-            const userId = getUserIdValue(); // cookieNames.ISS_USER_ID
-            const sid = getSessionIdValue(); // cookieNames.SESSION_ID
+            const deviceId = getDeviceIdValue();
+            const sid = getSessionIdValue();
 
             const variationNames = universes
                 .filter((item) => item.universeName === experimentSettings.CONCEPT_FUNNEL)
@@ -180,10 +179,11 @@ export default {
             const isConceptExposed = universes.find(
                 (item) => item.universeName === experimentSettings.CONCEPT_FUNNEL
             )?.isExposed;
+            
+            const submittedOrder = store.getSubmittedOrder();
+            const hasSubmittedOrder = store.hasSubmittedOrder();
 
             // TODO: Find equivalent ISS methods for these:
-            const submittedOrder = null;//baseMixin.methods.getSubmittedOrder();
-            const hasSubmittedOrder = false;//baseMixin.methods.hasSubmittedOrder();
             const hasSubmittedOrderAtConfirmationPage =
                 hasSubmittedOrder && currentPageName?.toLowerCase() == routeData.CONFIRMATION.name;
 
@@ -217,10 +217,11 @@ export default {
         // This bucket data is then picked up by snowflake for analytics use.
         pushIssSessionData() {
             const store = useMainStore();
-            const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
-            const submittedOrder = baseMixin.methods.getSubmittedOrder();
+            const submittedOrder = store.getSubmittedOrder();
+            const hasSubmittedOrder = store.hasSubmittedOrder();
             const order = hasSubmittedOrder ? submittedOrder : store.order;
 
+            // TODO: Find equivalent ISS methods for these:
             const hasSubmittedApplicationUser = baseMixin.methods.hasSubmittedApplicationUser();
             const submittedApplicationUser = baseMixin.methods.getSubmittedApplicationUser();
             const applicationUser = hasSubmittedApplicationUser
@@ -280,7 +281,7 @@ export default {
             sessionData.sid = getSessionIdValue();
             sessionData.deviceId = getDeviceIdValue();
             sessionData.fmgSessionId = applicationUser?.savedSessionId;
-            sessionData.skey = getskeyValue().toString();
+            sessionData.skey = getSessionKeyValue().toString();
             sessionData.userId = getUserIdValue();
             sessionData.carId = order?.vehicle?.carId;
             sessionData.vehicleYear = order?.vehicle?.year;
@@ -304,8 +305,11 @@ export default {
             sessionData.parentAccountNumber = order?.payment?.parentAccountNumber;
             sessionData.billToAccountNumber = order?.payment?.billToAccountNumber;
             sessionData.settledTenderAmount = order?.settledTenderAmount;
+
+            // TODO: Find equivalent ISS methods for these:
             sessionData.recalRequired = containsRecalParts(order?.lineItems);
             sessionData.recalType = getRecalPartNumbers(order?.lineItems?.glassParts);
+
             sessionData.serviceZipCode = order?.serviceLocation?.provider?.address?.zipCode
                 ? order?.serviceLocation?.provider?.address?.zipCode
                 : order?.serviceLocation?.zipCode;
@@ -326,8 +330,11 @@ export default {
             sessionData.coverageSubStatus = order?.payment?.insuranceCoverage?.coverageSubStatus;
             sessionData.isNoComp = order?.policy?.isNoComp;
             sessionData.isItac = order?.policy?.isItac;
+
+            // TODO: Find equivalent ISS methods for these:
             sessionData.subTotalPrice = getSubTotal(order?.lineItems);
             sessionData.totalPrice = getAmountDue(order?.lineItems, true);
+
             sessionData.userAgent = navigator.userAgent;
             sessionData.cashPriceSubTotal = order?.cashPriceSubTotal;
 
diff --git a/src/store/index.js b/src/store/index.js
index 963929b1..b6c113cd 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2623,6 +2623,7 @@ export const useMainStore = defineStore({
             this.applicationUser.triggeredSiteEntry = wasSiteEntryTriggered;
         },
             
+        // TODO: Shouldn't this be async?
         logDigitalConsumer(
             {
                 deviceId,
@@ -2665,6 +2666,7 @@ export const useMainStore = defineStore({
             );
         },
 
+        // TODO: Shouldn't this be async?
         logIssSessionData(
             {
                 currentPage,