diff --git a/src/store/index.js b/src/store/index.js
index 58693b42..5a545eb6 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -79,68 +79,7 @@ const getDefaultState = () => ({
             emailAddress: null,
             phoneNumber: null
         },
-<<<<<<< HEAD
-            
-            // Many more details in FMG
-            serviceLocation: {
-=======
-const getDefaultState = () => ({
-    order: {
-        vehicle: {
-            registration: {
-                licensePlate: null,
->>>>>>> 6caff3c296f1e024969552bab3b96862ea26c170
-                address: null,
-                city: null,
-                state: null,
-                zipCode: null,
-<<<<<<< HEAD
-                zipCodeCtu: null
-            },
-            // otherParts vs serverData
-            lineItems: {
-                glassParts: null,
-                otherParts: null, // TODO what is this?
-                supportingItems: null,
-                vaps: null,
-                serverData: null // TODO add
-            },
-            // Add parent account number from FMG
-            payment: {
-                isInsurance: true, // TODO delete; irrelevant to ISS
-                insuranceCoverage: {
-                    isVerified: false,
-                    coverageStatus: coverageStatuses.PENDING
-                },
-                parentAccountNumber: 0 // TODO what is this for and where set?
-            },
-            // DNE in FMG
-            contactInfo: {
-                firstName: null,
-                lastName: null,
-                emailAddress: null,
-                phoneNumber: null,
-                requestTextUpdates: false,
-                notesForTechnician: ''
-            },
-            schedule: {
-                date: null,
-                startTime: null,
-                endTime: null,
-                routeCode: null,
-                jobMaxMinutes: null
-            },
-            referralNumber: null,
-            referralDate: null
-=======
-                firstName: null,
-                lastName: null
-            }
->>>>>>> 6caff3c296f1e024969552bab3b96862ea26c170
-        },
-        
-        
-        
+        // Many more details in FMG
         serviceLocation: {
             address: null,
             city: null,
@@ -148,14 +87,16 @@ const getDefaultState = () => ({
             zipCode: null,
             zipCodeCtu: null
         },
+        // otherParts vs serverData
         lineItems: {
             glassParts: null,
-            otherParts: null,
+            otherParts: null, // TODO what is this?
             supportingItems: null,
             vaps: null
         },
+        // Add parent account number from FMG
         payment: {
-            isInsurance: true,
+            isInsurance: true, // TODO delete; irrelevant to ISS
             insuranceCoverage: {
                 isVerified: false,
                 coverageStatus: coverageStatuses.PENDING
@@ -163,6 +104,7 @@ const getDefaultState = () => ({
         },
         referralNumber: null,
         referralDate: null,
+        // DNE in FMG
         contactInfo: {
             firstName: null,
             lastName: null,
@@ -170,6 +112,13 @@ const getDefaultState = () => ({
             phoneNumber: null,
             requestTextUpdates: false,
             notesForTechnician: ''
+        },
+        schedule: {
+            date: null,
+            startTime: null,
+            endTime: null,
+            routeCode: null,
+            jobMaxMinutes: null
         }
     },
     applicationUser: {
@@ -801,7 +750,10 @@ export const useMainStore = defineStore({
                             damageState: policy.damageState,
                             damageCity: policy.damageCity,
                             isDamageGlassOnly: policy.isDamageGlassOnly,
-                            noCoverage: policy.noCoverage
+                            noCoverage: policy.noCoverage,
+                            policyLookupSuccessful: policy.policyLookupSuccessful,
+                            originalDeductible: order.originalDeductible,
+                            currentDeductible: order.currentDeductible
                         },
                         // TODO incorporate name and email contact details where appropriate
                         customer: {
@@ -838,7 +790,8 @@ export const useMainStore = defineStore({
                             city: order.serviceLocation.city,
                             state: order.serviceLocation.state,
                             zipCode: order.serviceLocation.zipCode,
-                            zipCodeCtu: order.serviceLocation.zipCodeCtu
+                            zipCodeCtu: order.serviceLocation.zipCodeCtu,
+                            techNotes: order.contactInfo.notesForTechnician
                         },
                         schedule: {
                             date: order.schedule?.date,
@@ -848,9 +801,7 @@ export const useMainStore = defineStore({
                             jobMaxMinutes: order.schedule?.jobMaxMinutes
                         },
                         referralDate: order.referralDate,
-                        referralNumber: order.referralNumber?.toString(),
-                        originalDeductible: order.originalDeductible,
-                        currentDeductible: order.currentDeductible
+                        referralNumber: order.referralNumber?.toString()
                     }
                 },
                 // TODO maybe modify