diff --git a/src/store/index.js b/src/store/index.js
index 5a545eb6..831bf1fe 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -712,50 +712,42 @@ export const useMainStore = defineStore({
                         savedSessionId: applicationUser.savedSessionId
                     },
                     order: {
-                        // done
                         vehicle: {
-                            carId: vehicle.carId,
                             year: vehicle.year,
                             make: vehicle.make,
                             model: vehicle.model,
                             style: vehicle.style,
                             vin: vehicle.vin,
-                            imageUrl: vehicle.imageUrl,
-                            imageVifColor: vehicle.imageColor,
-                            imageVifNumber: vehicle.imageVifNumber,
-                            registration: {
-                                firstName: vehicle.registration.firstName,
-                                lastName: vehicle.registration.lastName,
-                                streetAddress: vehicle.registration.address,
-                                city: vehicle.registration.city,
-                                state: vehicle.registration.state,
-                                zipCode: vehicle.registration.zipCode,
-                                licensePlateNumber: vehicle.registration.licensePlate
-                            }
+                            carId: vehicle.carId,
+                            licensePlateNumber: vehicle.registration.licensePlate
                         },
-                        // done
                         damage: {
                             numberOfChips: damage.numberOfChips,
                             glassToReplace: newGlassToReplace,
                             isRepair: damage.isRepair,
                             partQuestionAnswers: order.damage.partQuestionAnswers,
                             moldingQuestionAnswers: order.damage.moldingQuestionAnswers,
-                            capabilityQuestionAnswers: order.damage.capabilityQuestionAnswers
-                        },
-                        policy: {
-                            policyNumber: policy.policyNumber,
-                            policyZipCode: policy.policyZipCode,
+                            capabilityQuestionAnswers: order.damage.capabilityQuestionAnswers,
                             dateOfLoss: policy.dateOfLoss,
                             damageCause: policy.damageCause,
                             damageState: policy.damageState,
                             damageCity: policy.damageCity,
-                            isDamageGlassOnly: policy.isDamageGlassOnly,
+                            isDamageGlassOnly: policy.isDamageGlassOnly
+                        },
+                        policy: {
+                            policyHolder: {
+                                policyFirstName: order.customer.firstName,
+                                policyLastName: order.customer.lastName,
+                                policyPhoneNumber: order.customer.phoneNumber,
+                                policyEmail: order.customer.emailAddress
+                            },
+                            policyNumber: policy.policyNumber,
+                            policyZipCode: policy.policyZipCode,
                             noCoverage: policy.noCoverage,
                             policyLookupSuccessful: policy.policyLookupSuccessful,
                             originalDeductible: order.originalDeductible,
                             currentDeductible: order.currentDeductible
                         },
-                        // TODO incorporate name and email contact details where appropriate
                         customer: {
                             address: {
                                 streetAddress: order.customer.address.streetAddress,
@@ -764,16 +756,14 @@ export const useMainStore = defineStore({
                                 state: order.customer.address.state,
                                 zipCode: order.customer.address.zipCode
                             },
-                            emailAddress: order.customer.emailAddress,
-                            firstName: order.customer.firstName,
-                            lastName: order.customer.lastName,
-                            policyPhoneNumber: order.customer.phoneNumber,
-                            smsPhoneNumber: order.contactInfo.requestTextUpdates ? order.contactInfo.phoneNumber : null,
+                            emailAddress: order.contactInfo.emailAddress,
+                            firstName: order.contactInfo.firstName,
+                            lastName: order.contactInfo.lastName,
+                            phoneNumber: order.contactInfo.phoneNumber,
                             optInSms: order.contactInfo.requestTextUpdates ?? false
                         },
                         lineItems: {
                             glassParts: lineItems.glassParts,
-                            otherData: lineItems.otherData,
                             supportingItems: lineItems.supportingItems,
                             vaps: lineItems.vaps
                         },
@@ -786,11 +776,13 @@ export const useMainStore = defineStore({
                             parentAccountNumber: this.issConfig.accountNumber
                         },
                         serviceLocation: {
-                            streetAddress: order.serviceLocation.address,
-                            city: order.serviceLocation.city,
-                            state: order.serviceLocation.state,
-                            zipCode: order.serviceLocation.zipCode,
-                            zipCodeCtu: order.serviceLocation.zipCodeCtu,
+                            address: {
+                                streetAddress: order.serviceLocation.address,
+                                city: order.serviceLocation.city,
+                                state: order.serviceLocation.state,
+                                zipCode: order.serviceLocation.zipCode,
+                                zipCodeCtu: order.serviceLocation.zipCodeCtu
+                            },
                             techNotes: order.contactInfo.notesForTechnician
                         },
                         schedule: {
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index c8be5dbc..a4d02857 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -74,7 +74,7 @@ describe('Store', () => {
         expect(store.applicationUser.eventBus.length).toBe(1);
 
         // Act
-        store.removeEventFromBus({ category: event.category, subCategory: event.subCategory })
+        store.removeEventFromBus({ category: event.category, subCategory: event.subCategory });
 
         // Assert
         expect(store.applicationUser.eventBus.length).toBe(0);