diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component.html
index 72d4d598..67c8d284 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component.html
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component.html
@@ -2,15 +2,20 @@ <h5 class="bold w-100 text-center">
     <fa-icon [icon]="faBuilding" class="me-2"></fa-icon> {{company.generalInformation.name}}
 </h5>
 
-<table class="table table-bordered table-hover">
+<table class="table table-bordered table-hover table-sm">
     <tbody>
         <tr>
             <td class="w-25">
                 Address
             </td>
             <td>
-                <!--TODO: add address format-->
-                &mdash;
+                @let address = company.generalInformation | addressDisplay;
+                <ng-template [ngIf]="address" [ngIfElse]="addressMdash">
+                    {{address}}
+                </ng-template>
+                <ng-template #addressMdash>
+                    &mdash;
+                </ng-template>
             </td>
         </tr>
         <tr>
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.html
index d495a060..95b25313 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.html
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.html
@@ -1,29 +1,81 @@
 <h5 class="bold w-100 text-center">
     <fa-icon [icon]="faChartBar" class="me-2"></fa-icon> Key Performance Indicators
 </h5>
-<div class="row">
-    <div class="col-lg-6 col-md-12 pb-2" *ngFor="let kpi of (company.guid | companyKpiList:keyPerformanceIndicators)">
-        <div class="card">
-            <div class="card-header">
-                <fa-icon [icon]="faBullseye" class="pe-1"></fa-icon>
-                <span [innerHTML]="kpi.htmlLabel"></span>
-            </div>
-            <div class="card-body">
 
-                <table class="table table-sm">
-                    <tbody>
-                        <tr>
-                            <td class="w-50">
-                                KPI Category
-                            </td>
-                            <td>
-                                <app-primary-kpi-badge [kpiOption]="kpi"></app-primary-kpi-badge>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+<table class="table table-bordered savings-table table-hover table-sm">
+    <thead>
+        <tr>
+            <th>
+                <!-- KPM -->
+            </th>
+            <th>
+                Units
+            </th>
+            <th>
+                Cost<br> Per Unit
+            </th>
+            <th>
+                Baseline<br> Amount
+            </th>
+            <th>
+                Baseline Cost<br> (&dollar;/yr)
+            </th>
+        </tr>
+    </thead>
+    <tbody>
+        <ng-container *ngFor="let kpi of keyPerformanceIndicators">
+            <tr>
+                <th colspan="5">
+                    <span [innerHTML]="kpi.htmlLabel"></span>
+                </th>
+            </tr>
+            <tr *ngFor="let keyPerformanceMetric of kpi.performanceMetrics">
+                <td class="ps-3">
+                    <span [innerHTML]="keyPerformanceMetric.htmlLabel"></span>
+                </td>
+                <ng-template [ngIf]="keyPerformanceMetric.isQuantitative" [ngIfElse]="qualitativeBlock">
 
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+                    <td>
+                        <ng-template [ngIf]="keyPerformanceMetric.calculationMethod == 'costPerUnit'"
+                            [ngIfElse]="unitMdash">
+                            <app-single-cell-item [strValue]="keyPerformanceMetric.totalUnit"
+                                [isCurrency]="false"></app-single-cell-item>
+                        </ng-template>
+                        <ng-template #unitMdash>
+                            &mdash;
+                        </ng-template>
+                    </td>
+                    <td>
+                        <ng-template [ngIf]="keyPerformanceMetric.calculationMethod == 'costPerUnit'"
+                            [ngIfElse]="costPerMdash">
+                            <app-single-cell-item [numValue]="keyPerformanceMetric.costPerValue"
+                                [isCurrency]="true"></app-single-cell-item>
+                        </ng-template>
+                        <ng-template #costPerMdash>
+                            &mdash;
+                        </ng-template>
+                    </td>
+                    <td>
+                        <ng-template [ngIf]="keyPerformanceMetric.calculationMethod == 'costPerUnit'"
+                            [ngIfElse]="baselineValueMdash">
+                            <app-single-cell-item [numValue]="keyPerformanceMetric.baselineValue"
+                                [isCurrency]="false"></app-single-cell-item>
+                        </ng-template>
+                        <ng-template #baselineValueMdash>
+                            &mdash;
+                        </ng-template>
+                    </td>
+                    <td>
+                        <app-single-cell-item [numValue]="keyPerformanceMetric.baselineCost"
+                            [isCurrency]="true"></app-single-cell-item>
+                    </td>
+                </ng-template>
+                <ng-template #qualitativeBlock>
+                    <td colspan="4">
+                        Qualitative Metric
+                    </td>
+                </ng-template>
+            </tr>
+        </ng-container>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.ts
index e6c30279..0cdba268 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component.ts
@@ -28,7 +28,9 @@ export class CompanyKpisSummaryComponent {
 
   ngOnInit(){
     this.company = this.companyIdbService.selectedCompany.getValue();
-    this.keyPerformanceIndicators = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.getValue();
+    this.keyPerformanceIndicators = this.keyPerformanceIndicatorIdbService.keyPerformanceIndicators.getValue().filter(kpi => {
+      return kpi.companyId == this.company.guid;
+    });
     this.contacts = this.contactsIdbService.contacts.getValue();
   }
 }
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.html
index 339f1727..7c781325 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.html
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component.html
@@ -2,15 +2,20 @@ <h5 class="bold w-100 text-center">
     <fa-icon [icon]="faIndustry" class="me-2"></fa-icon> {{facility.generalInformation.name}}
 </h5>
 
-<table class="table table-bordered table-hover">
+<table class="table table-bordered table-hover table-sm">
     <tbody>
         <tr>
             <td class="w-25">
                 Address
             </td>
             <td>
-                <!--TODO: add address format-->
-                &mdash;
+                @let address = facility.generalInformation | addressDisplay;
+                <ng-template [ngIf]="address" [ngIfElse]="addressMdash">
+                    {{address}}
+                </ng-template>
+                <ng-template #addressMdash>
+                    &mdash;
+                </ng-template>
             </td>
         </tr>
         <tr>
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.html
index 6d041e88..9381aa4b 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.html
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.html
@@ -1,71 +1,76 @@
 <h5 class="bold w-100 text-center">
     <fa-icon [icon]="faToolbox" class="me-2"></fa-icon> Pre-Assessments for {{onSiteVisit.visitDate| date}}
 </h5>
-<div class="row">
-    <div class="col-lg-6 col-md-12 pb-2" *ngFor="let assessment of (onSiteVisit.assessmentIds | assessmentListOnSite: assessments)">
-        <div class="card">
-            <div class="card-header">
-                <fa-icon [icon]="faScrewdriverWrench" class="pe-1"></fa-icon>
-                {{assessment.name}}
-            </div>
-            <div class="card-body">
 
-                <table class="table table-sm">
-                    <tbody>
-                        <!-- <tr>
-                            <td>
-                                Process Equipment
-                            </td>
-                            <td>
-                                <ng-template [ngIf]="assessment.equipmentId" [ngIfElse]="equipmentMdash">
-                                    {{assessment.equipmentId | processEquipmentDisplay: processEquipment}}
-                                </ng-template>
-                                <ng-template #equipmentMdash>
-                                    &mdash;
-                                </ng-template>
-                            </td>
-                        </tr> -->
-                        <tr>
-                            <td>
-                                Annual Energy Use
-                            </td>
-                            <td>
-                                <app-single-cell-item [numValue]="assessment.energyUse"></app-single-cell-item>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                Annual Costs
-                            </td>
-                            <td>
-                                <app-single-cell-item [numValue]="assessment.cost" [isCurrency]="true"></app-single-cell-item>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                Contacts
-                            </td>
-                            <td>
-                                <ng-template [ngIf]="(assessment.guid| associatedContacts:'assessment': contacts).length != 0"
-                                    [ngIfElse]="contactMdash">
-                                    <div class="d-flex">
-                                        <div class="pe-1"
-                                            *ngFor="let contact of assessment.guid| associatedContacts:'assessment': contacts;">
-                                            <span class="badge bg-primary">
-                                                <fa-icon [icon]="faUser"></fa-icon>
-                                                {{contact | contactNameDisplay}}
-                                            </span>
-                                        </div>
-                                    </div>
-                                </ng-template>
-                                <ng-template #contactMdash>
-                                    &mdash;
-                                </ng-template>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
+@let preAssessments = (onSiteVisit.assessmentIds | assessmentListOnSite: assessments);
+<ng-template [ngIf]="preAssessments.length > 0" [ngIfElse]="noPreAssessmentsBlock">
+    <table class="table table-bordered table-hover table-sm">
+        <thead>
+            <tr>
+                <th>
+                    Name
+                </th>
+                <th>
+                    Type
+                </th>
+                <th>
+                    Utility Types
+                </th>
+                <th>
+                    Baseline<br>
+                    Energy Use<br>
+                    <span class="fw-light">({{companyEnergyUnit}}/yr)</span>
+                </th>
+                <th>
+                    Baseline<br>
+                    Energy Cost<br>
+                    <span class="fw-light">
+                        (&dollar;/yr)
+                    </span>
+                </th>
+                <th>
+                    Stakeholders
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let assessment of preAssessments">
+                <td>
+                    {{assessment.name}}
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="assessment.assessmentType"></app-single-cell-item>
+                </td>
+                <td>
+                    <ng-container *ngFor="let utilityType of assessment.utilityEnergyUses">
+                        <ng-container *ngIf="utilityType.include">
+                            {{utilityType.utilityType}}<br>
+                        </ng-container>
+                    </ng-container>
+                </td>
+                <td>
+                    <app-single-cell-item [numValue]="assessment.energyUse"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [numValue]="assessment.cost" [isCurrency]="true"></app-single-cell-item>
+                </td>
+                <td>
+                    @let associatedContacts = assessment.guid | associatedContacts:'assessment': contacts;
+                    <ng-template [ngIf]="associatedContacts.length > 0" [ngIfElse]="noContactsBlock">
+                        <span *ngFor="let contact of associatedContacts">
+                            {{contact | contactNameDisplay}} <br>
+                        </span>
+                    </ng-template>
+                    <ng-template #noContactsBlock>
+                        &mdash;
+                    </ng-template>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</ng-template>
+<ng-template #noPreAssessmentsBlock>
+    <div class="alert alert-info small p-2">
+        No pre-assessments added for this visit.
     </div>
-</div>
\ No newline at end of file
+</ng-template>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.spec.ts
index a76bcec6..b8390882 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.spec.ts
@@ -4,45 +4,17 @@ import { PreAssessmentSummaryComponent } from './pre-assessment-summary.componen
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { BehaviorSubject } from 'rxjs';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbOnSiteVisit, getNewIdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { IdbContact } from 'src/app/models/contact';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
 
 describe('PreAssessmentSummaryComponent', () => {
   let component: PreAssessmentSummaryComponent;
   let fixture: ComponentFixture<PreAssessmentSummaryComponent>;
 
-
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  };
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    selectedVisit: new BehaviorSubject<IdbOnSiteVisit>(getNewIdbOnSiteVisit('', '', ''))
-  };
-  let contactIdbService: Partial<ContactIdbService> = {
-    contacts: new BehaviorSubject<Array<IdbContact>>([])
-  };
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [ FontAwesomeModule, HelperPipesModule, TableEntriesModule],
       declarations: [PreAssessmentSummaryComponent],
-      providers: [
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-        { provide: ContactIdbService, useValue: contactIdbService }
-     
-      ]
+      providers: stubServiceProviders
     })
     .compileComponents();
     
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.ts
index 58583276..5d83554c 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/pre-assessment-summary/pre-assessment-summary.component.ts
@@ -1,13 +1,13 @@
 import { Component } from '@angular/core';
 import { IconDefinition, faScrewdriverWrench, faToolbox, faUser } from '@fortawesome/free-solid-svg-icons';
 import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
 import { IdbAssessment } from 'src/app/models/assessment';
+import { IdbCompany } from 'src/app/models/company';
 import { IdbContact } from 'src/app/models/contact';
 import { IdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-// import { ProcessEquipment } from 'src/app/shared/constants/processEquipment';
 
 @Component({
   selector: 'app-pre-assessment-summary',
@@ -20,19 +20,20 @@ export class PreAssessmentSummaryComponent {
   assessments: Array<IdbAssessment>;
   faToolbox: IconDefinition = faToolbox;
   faScrewdriverWrench: IconDefinition = faScrewdriverWrench;
-  // processEquipment: Array<ProcessEquipment>;
   contacts: Array<IdbContact>;
   faUser: IconDefinition = faUser;
   onSiteVisit: IdbOnSiteVisit;
-  constructor(private facilityIdbService: FacilityIdbService, private contactIdbService: ContactIdbService,
+  companyEnergyUnit: string;
+  constructor(private companyIdbService: CompanyIdbService, private contactIdbService: ContactIdbService,
     private assessmentIdbService: AssessmentIdbService, private onSiteVisitIdbService: OnSiteVisitIdbService
   ) {
   }
 
   ngOnInit() {
+    let company: IdbCompany = this.companyIdbService.selectedCompany.getValue();
+    this.companyEnergyUnit = company.companyEnergyUnit;
     this.onSiteVisit = this.onSiteVisitIdbService.selectedVisit.getValue();
     this.assessments = this.assessmentIdbService.assessments.getValue();
-    // this.processEquipment = this.facilityIdbService.selectedFacility.getValue().processEquipment;
     this.contacts = this.contactIdbService.contacts.getValue();
   }
 }
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.html
index e6e28aac..21d0b4fd 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.html
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.html
@@ -1,89 +1,45 @@
-<h5 class="bold w-100 text-center"><fa-icon [icon]="faDiagramProject" class="me-2"></fa-icon>Process Equipment</h5>
-<div class="row">
-    <div class="col-lg-6 col-md-12 pb-2" *ngFor="let equipment of processEquipment">
-        <div class="card">
-            <div class="card-header">
-                <!-- <fa-icon [icon]="equipment.guid | equipmentTypeIcon: processEquipment" class="pe-1"></fa-icon> -->
-                {{equipment.equipmentName}}
-            </div>
-            <div class="card-body">
-                <table class="table table-sm">
-                    <tbody>
-                        <!-- <tr>
-                            <td>
-                                Equipment Type
-                            </td>
-                            <td>
-                                <app-single-cell-item [strValue]="equipment.equipmentType"></app-single-cell-item>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                Utility Type
-                            </td>
-                            <td>
-                                <app-single-cell-item [strValue]="equipment.utilityType"></app-single-cell-item>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                Total Size
-                            </td>
-                            <td>
-                                <app-single-cell-item [numValue]="equipment.size"></app-single-cell-item>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                Operating Hours
-                            </td>
-                            <td>
-                                <app-single-cell-item [numValue]="equipment.operatingHours" [units]="'Hrs'"
-                                    [per]="'yr'"></app-single-cell-item>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                Load Factor
-                            </td>
-                            <td>
-                                <app-single-cell-item [numValue]="equipment.loadFactor"
-                                    [units]="'%'"></app-single-cell-item>
-                            </td>
-                        </tr> -->
-                        <tr>
-                            <td>
-                                Notes
-                            </td>
-                            <td>
-                                <app-single-cell-item [strValue]="equipment.notes"></app-single-cell-item>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                Contacts
-                            </td>
-                            <td>
-                                <ng-template [ngIf]="(equipment.guid| associatedContacts:'processEquipment': contacts).length != 0"
-                                    [ngIfElse]="contactMdash">
-                                    <div class="d-flex">
-                                        <div class="pe-1"
-                                            *ngFor="let contact of equipment.guid| associatedContacts:'processEquipment': contacts;">
-                                            <span class="badge bg-primary">
-                                                <fa-icon [icon]="faUser"></fa-icon>
-                                                {{contact | contactNameDisplay}}
-                                            </span>
-                                        </div>
-                                    </div>
-                                </ng-template>
-                                <ng-template #contactMdash>
-                                    &mdash;
-                                </ng-template>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
+<h5 class="bold w-100 text-center"><fa-icon [icon]="faDiagramProject" class="me-2"></fa-icon>End Use Inventory</h5>
+<ng-template [ngIf]="processEquipments.length > 0" [ngIfElse]="noEquipmentBlock">
+    <table class="table table-bordered table-hover table-sm">
+        <thead>
+            <tr>
+                <th class="w-25">
+                    Name
+                </th>
+                <th class="w-50">
+                    Notes
+                </th>
+                <th class="w-25">
+                    Stakeholders
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let processEquipment of processEquipments">
+                <td>
+                    {{processEquipment.equipmentName}}
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="processEquipment.notes"></app-single-cell-item>
+                </td>
+                <td>
+                    @let associatedContacts = processEquipment.guid | associatedContacts:'processEquipment': contacts;
+                    <ng-template [ngIf]="associatedContacts.length > 0" [ngIfElse]="noContactsBlock">
+                        <span *ngFor="let contact of associatedContacts">
+                            {{contact | contactNameDisplay}} <br>
+                        </span>
+                    </ng-template>
+                    <ng-template #noContactsBlock>
+                        &mdash;
+                    </ng-template>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</ng-template>
+
+<ng-template #noEquipmentBlock>
+    <div class="alert alert-info small p-2">
+        No end use inventory items added to this facility.
     </div>
-</div>
\ No newline at end of file
+</ng-template>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.spec.ts
index f09916c6..95732340 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.spec.ts
@@ -3,31 +3,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ProcessEquipmentSummaryComponent } from './process-equipment-summary.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { BehaviorSubject } from 'rxjs';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { IdbContact } from 'src/app/models/contact';
-import { ProcessEquipmentIdbService } from 'src/app/indexed-db/process-equipment-idb.service';
-import { IdbProcessEquipment } from 'src/app/models/processEquipment';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
 
 describe('ProcessEquipmentSummaryComponent', () => {
   let component: ProcessEquipmentSummaryComponent;
   let fixture: ComponentFixture<ProcessEquipmentSummaryComponent>;
-
-  let contactIdbService: Partial<ContactIdbService> = {
-    contacts: new BehaviorSubject<Array<IdbContact>>([])
-  };
-  let processEquipmentIdbService: Partial<ProcessEquipmentIdbService> = {
-    processEquipments: new BehaviorSubject<Array<IdbProcessEquipment>>([])
-  }
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, HelperPipesModule],
+      imports: [FontAwesomeModule, HelperPipesModule, TableEntriesModule],
       declarations: [ProcessEquipmentSummaryComponent],
-      providers: [
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: ProcessEquipmentIdbService, useValue: processEquipmentIdbService }
-      ]
+      providers: stubServiceProviders
     })
       .compileComponents();
 
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.ts
index 9ca7c2ac..ca002566 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component.ts
@@ -1,8 +1,10 @@
 import { Component } from '@angular/core';
 import { IconDefinition, faDiagramProject, faUser } from '@fortawesome/free-solid-svg-icons';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
 import { ProcessEquipmentIdbService } from 'src/app/indexed-db/process-equipment-idb.service';
 import { IdbContact } from 'src/app/models/contact';
+import { IdbFacility } from 'src/app/models/facility';
 import { IdbProcessEquipment } from 'src/app/models/processEquipment';
 
 @Component({
@@ -13,15 +15,18 @@ import { IdbProcessEquipment } from 'src/app/models/processEquipment';
 export class ProcessEquipmentSummaryComponent {
 
   faDiagramProject: IconDefinition = faDiagramProject;
-  processEquipment: Array<IdbProcessEquipment>;
+  processEquipments: Array<IdbProcessEquipment>;
   contacts: Array<IdbContact>;
   faUser: IconDefinition = faUser;
-  constructor(private processEquipmentIdbService: ProcessEquipmentIdbService, private contactIdbService: ContactIdbService){
+  constructor(private processEquipmentIdbService: ProcessEquipmentIdbService, private contactIdbService: ContactIdbService,
+    private facilityIdbService: FacilityIdbService
+  ) {
 
   }
 
-  ngOnInit(){
-    this.processEquipment = this.processEquipmentIdbService.processEquipments.getValue();
+  ngOnInit() {
+    let facility: IdbFacility = this.facilityIdbService.selectedFacility.getValue();
+    this.processEquipments = this.processEquipmentIdbService.getFacilityProcessEquipment(facility.guid);
     this.contacts = this.contactIdbService.contacts.getValue();
   }
 }
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.html
index 0f8757d9..6ae25909 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.html
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.html
@@ -15,6 +15,8 @@ <h5>
                     <hr class="solid-hr">
                     <app-facility-details-summary></app-facility-details-summary>
                     <hr>
+                    <app-system-inventory-summary></app-system-inventory-summary>
+                    <hr>
                     <app-process-equipment-summary></app-process-equipment-summary>
                     <hr class="solid-hr">
                     <app-pre-assessment-summary></app-pre-assessment-summary>
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.spec.ts
index 7fcf35d6..9bb0df44 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/review-pre-visit-setup.component.spec.ts
@@ -2,15 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ReviewPreVisitSetupComponent } from './review-pre-visit-setup.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { BehaviorSubject } from 'rxjs';
-import { IdbCompany, getNewIdbCompany } from 'src/app/models/company';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
 import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
-import { SetupWizardService } from 'src/app/setup-wizard/setup-wizard.service';
 import { TeamDetailsSummaryComponent } from './team-details-summary/team-details-summary.component';
 import { ProcessEquipmentSummaryComponent } from './process-equipment-summary/process-equipment-summary.component';
 import { PreAssessmentSummaryComponent } from './pre-assessment-summary/pre-assessment-summary.component';
@@ -18,60 +10,18 @@ import { FacilityDetailsSummaryComponent } from './facility-details-summary/faci
 import { CompanyKpisSummaryComponent } from './company-kpis-summary/company-kpis-summary.component';
 import { CompanyDetailsSummaryComponent } from './company-details-summary/company-details-summary.component';
 import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
-import { OnSiteVisitIdbService } from 'src/app/indexed-db/on-site-visit-idb.service';
-import { IdbOnSiteVisit, getNewIdbOnSiteVisit } from 'src/app/models/onSiteVisit';
-import { IdbContact } from 'src/app/models/contact';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { KeyPerformanceIndicatorsIdbService } from 'src/app/indexed-db/key-performance-indicators-idb.service';
-import { IdbKeyPerformanceIndicator } from 'src/app/models/keyPerformanceIndicator';
-import { ProcessEquipmentIdbService } from 'src/app/indexed-db/process-equipment-idb.service';
-import { IdbProcessEquipment } from 'src/app/models/processEquipment';
+import { SystemInventorySummaryComponent } from './system-inventory-summary/system-inventory-summary.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
 
 describe('ReviewPreVisitSetupComponent', () => {
   let component: ReviewPreVisitSetupComponent;
   let fixture: ComponentFixture<ReviewPreVisitSetupComponent>;
 
-  let setupWizardService: Partial<SetupWizardService> = {
-    sidebarOpen: new BehaviorSubject<boolean>(false),
-  };
-  let companyIdbService: Partial<CompanyIdbService> = {
-    companies: new BehaviorSubject<Array<IdbCompany>>([]),
-    selectedCompany: new BehaviorSubject<IdbCompany>(getNewIdbCompany(''))
-  };
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  };
-  let onSiteVisitIdbService: Partial<OnSiteVisitIdbService> = {
-    selectedVisit: new BehaviorSubject<IdbOnSiteVisit>(getNewIdbOnSiteVisit('', '', ''))
-  };
-
-  let contactIdbService: Partial<ContactIdbService> = {
-    contacts: new BehaviorSubject<Array<IdbContact>>([])
-  };
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let keyPerformanceIndicatorIdbService: Partial<KeyPerformanceIndicatorsIdbService> = {
-    keyPerformanceIndicators: new BehaviorSubject<Array<IdbKeyPerformanceIndicator>>([])
-  };
-  let processEquipmentIdbService: Partial<ProcessEquipmentIdbService> = {
-    processEquipments: new BehaviorSubject<Array<IdbProcessEquipment>>([])
-  }
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [FontAwesomeModule, HelperPipesModule, TableEntriesModule],
-      declarations: [ReviewPreVisitSetupComponent, TeamDetailsSummaryComponent, ProcessEquipmentSummaryComponent, PreAssessmentSummaryComponent, FacilityDetailsSummaryComponent, CompanyKpisSummaryComponent, CompanyDetailsSummaryComponent],
-      providers: [
-        { provide: SetupWizardService, useValue: setupWizardService },
-        { provide: CompanyIdbService, useValue: companyIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: ContactIdbService, useValue: contactIdbService },
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService },
-        { provide: KeyPerformanceIndicatorsIdbService, useValue: keyPerformanceIndicatorIdbService },
-        { provide: ProcessEquipmentIdbService, useValue: processEquipmentIdbService }
-      ]
+      declarations: [ReviewPreVisitSetupComponent, TeamDetailsSummaryComponent, ProcessEquipmentSummaryComponent, PreAssessmentSummaryComponent, FacilityDetailsSummaryComponent, CompanyKpisSummaryComponent, CompanyDetailsSummaryComponent, SystemInventorySummaryComponent],
+      providers: stubServiceProviders
     })
       .compileComponents();
 
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.css b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.css
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.html
new file mode 100644
index 00000000..55a1e0f9
--- /dev/null
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.html
@@ -0,0 +1,61 @@
+<h5 class="bold w-100 text-center"><fa-icon [icon]="faList" class="me-2"></fa-icon>Industrial System Inventory</h5>
+<ng-template [ngIf]="energyEquipments.length > 0" [ngIfElse]="noEquipmentAddedBlock">
+    <table class="table table-bordered table-hover table-sm">
+        <thead>
+            <tr>
+                <th>
+                    Name
+                </th>
+                <th>
+                    Industrial<br> System
+                </th>
+                <th>
+                    Utility<br> Type
+                </th>
+                <th>
+                    Energy Use<br>
+                    <span class="fw-light small">
+                        (<span [innerHTML]="companyEnergyUnit | unitsDisplay"></span>/yr)
+                    </span>
+                </th>
+                <th>
+                    Stakeholders
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let energyEquipment of energyEquipments">
+                <td>
+                    {{energyEquipment.equipmentName}}
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="energyEquipment.equipmentType"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="energyEquipment.utilityType"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [numValue]="energyEquipment.annualEnergyUse"
+                        [numValueDigits]="'1.0-0'"></app-single-cell-item>
+                </td>
+                <td>
+                    @let associatedContacts = energyEquipment.guid | associatedContacts:'energyEquipment': contacts;
+                    <ng-template [ngIf]="associatedContacts.length > 0" [ngIfElse]="noContactsBlock">
+                        <span *ngFor="let contact of associatedContacts">
+                            {{contact | contactNameDisplay}} <br>
+                        </span>
+                    </ng-template>
+                    <ng-template #noContactsBlock>
+                        &mdash;
+                    </ng-template>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</ng-template>
+
+<ng-template #noEquipmentAddedBlock>
+    <div class="alert alert-info small p-2">
+        No system inventory equipment added to this facility.
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.spec.ts
new file mode 100644
index 00000000..33188c1f
--- /dev/null
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.spec.ts
@@ -0,0 +1,29 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SystemInventorySummaryComponent } from './system-inventory-summary.component';
+import { stubServiceProviders } from 'src/app/spec-helpers/spec-test-service-stub';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
+import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
+
+describe('SystemInventorySummaryComponent', () => {
+  let component: SystemInventorySummaryComponent;
+  let fixture: ComponentFixture<SystemInventorySummaryComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FontAwesomeModule, HelperPipesModule, TableEntriesModule],
+      declarations: [SystemInventorySummaryComponent],
+      providers: stubServiceProviders
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(SystemInventorySummaryComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.ts
new file mode 100644
index 00000000..f1988034
--- /dev/null
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component.ts
@@ -0,0 +1,40 @@
+import { Component } from '@angular/core';
+import { faList, IconDefinition } from '@fortawesome/free-solid-svg-icons';
+import { CompanyIdbService } from 'src/app/indexed-db/company-idb.service';
+import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
+import { EnergyEquipmentIdbService } from 'src/app/indexed-db/energy-equipment-idb.service';
+import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
+import { IdbCompany } from 'src/app/models/company';
+import { IdbContact } from 'src/app/models/contact';
+import { IdbEnergyEquipment } from 'src/app/models/energyEquipment';
+import { IdbFacility } from 'src/app/models/facility';
+
+@Component({
+  selector: 'app-system-inventory-summary',
+  templateUrl: './system-inventory-summary.component.html',
+  styleUrl: './system-inventory-summary.component.css'
+})
+export class SystemInventorySummaryComponent {
+
+  faList: IconDefinition = faList;
+
+  facility: IdbFacility;
+  energyEquipments: Array<IdbEnergyEquipment>;
+
+  companyEnergyUnit: string;
+
+  contacts: Array<IdbContact>;
+  constructor(private facilityIdbService: FacilityIdbService,
+    private energyEquipmentIdbService: EnergyEquipmentIdbService,
+    private companyIdbService: CompanyIdbService,
+    private contactIdbService: ContactIdbService
+  ) { }
+
+  ngOnInit() {
+    let company: IdbCompany = this.companyIdbService.selectedCompany.getValue();
+    this.companyEnergyUnit = company.companyEnergyUnit;
+    this.facility = this.facilityIdbService.selectedFacility.getValue();
+    this.energyEquipments = this.energyEquipmentIdbService.getByOtherGuid(this.facility.guid, 'facility');
+    this.contacts = this.contactIdbService.contacts.getValue();
+  }
+}
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.css b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.css
deleted file mode 100644
index d4b8e8c6..00000000
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.card-header{
-    background-color: white;
-}
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.html
deleted file mode 100644
index 421747d8..00000000
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<div class="card">
-    <div class="card-header">
-        <fa-icon [icon]="faUser"></fa-icon> {{contact | contactNameDisplay}}
-    </div>
-    <div class="card-body">
-        <table class="table table-sm">
-            <tbody>
-                <tr>
-                    <td>
-                        Phone
-                    </td>
-                    <td>
-                        <app-single-cell-item [strValue]="contact.phone"></app-single-cell-item>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        Email
-                    </td>
-                    <td>
-                        <app-single-cell-item [strValue]="contact.email"></app-single-cell-item>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        Title
-                    </td>
-                    <td>
-                        <app-single-cell-item [strValue]="contact.role"></app-single-cell-item>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        Team
-                    </td>
-                    <td>
-                        <app-single-cell-item [strValue]="contact.team"></app-single-cell-item>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        Notes
-                    </td>
-                    <td>
-                        <app-single-cell-item [strValue]="contact.notes"></app-single-cell-item>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        KPIs
-                    </td>
-                    <td>
-                        <ng-template [ngIf]="contact.kpiIds.length != 0" [ngIfElse]="kpiMdash">
-                            <div class="d-flex">
-                                <div class="pe-1">
-                                    <!-- <span class="badge bg-dark" *ngFor="let kpi of contact.kpiIds"
-                                        [innerHTML]="kpi | kpiLabel"></span> -->
-                                </div>
-                            </div>
-                        </ng-template>
-                        <ng-template #kpiMdash>
-                            &mdash;
-                        </ng-template>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        End Use
-                    </td>
-                    <td>
-                        <ng-template [ngIf]="contact.processEquipmentIds.length != 0" [ngIfElse]="equipmentMdash">
-                            <div class="d-flex">
-                                <div class="pe-1">
-                                    <span class="badge bg-dark"
-                                        *ngFor="let processEquipmentId of contact.processEquipmentIds">{{processEquipmentId
-                                        | processEquipmentDisplay: processEquipment}}</span>
-                                </div>
-                            </div>
-                        </ng-template>
-                        <ng-template #equipmentMdash>
-                            &mdash;
-                        </ng-template>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        Assessments
-                    </td>
-                    <td>
-                        <ng-template [ngIf]="contact.assessmentIds.length != 0" [ngIfElse]="assessmentMdash">
-                            <div class="d-flex">
-                                <div class="pe-1">
-                                    <span class="badge bg-dark"
-                                        *ngFor="let assessmentId of contact.assessmentIds">{{assessmentId |
-                                        assessmentNameDisplay: assessments}}</span>
-                                </div>
-                            </div>
-                        </ng-template>
-                        <ng-template #assessmentMdash>
-                            &mdash;
-                        </ng-template>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.spec.ts
deleted file mode 100644
index f8a45108..00000000
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.spec.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ContactSummaryCardComponent } from './contact-summary-card.component';
-import { getNewIdbContact } from 'src/app/models/contact';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
-import { TableEntriesModule } from 'src/app/shared/table-entries/table-entries.module';
-import { BehaviorSubject } from 'rxjs';
-import { FacilityIdbService } from 'src/app/indexed-db/facility-idb.service';
-import { IdbFacility, getNewIdbFacility } from 'src/app/models/facility';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { ProcessEquipmentIdbService } from 'src/app/indexed-db/process-equipment-idb.service';
-import { IdbProcessEquipment } from 'src/app/models/processEquipment';
-
-describe('ContactSummaryCardComponent', () => {
-  let component: ContactSummaryCardComponent;
-  let fixture: ComponentFixture<ContactSummaryCardComponent>;
-
-  let facilityIdbService: Partial<FacilityIdbService> = {
-    facilities: new BehaviorSubject<Array<IdbFacility>>([]),
-    selectedFacility: new BehaviorSubject<IdbFacility>(getNewIdbFacility('', ''))
-  };
-  let assessmentIdbService: Partial<AssessmentIdbService> = {
-    assessments: new BehaviorSubject<Array<IdbAssessment>>([])
-  };
-  let processEquipmentIdbService: Partial<ProcessEquipmentIdbService> = {
-    processEquipments: new BehaviorSubject<Array<IdbProcessEquipment>>([])
-  };
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FontAwesomeModule, HelperPipesModule, TableEntriesModule],
-      declarations: [ContactSummaryCardComponent],
-      providers: [
-        { provide: AssessmentIdbService, useValue: assessmentIdbService },
-        { provide: FacilityIdbService, useValue: facilityIdbService },
-        { provide: ProcessEquipmentIdbService, useValue: processEquipmentIdbService }
-      ]
-    })
-      .compileComponents();
-
-    fixture = TestBed.createComponent(ContactSummaryCardComponent);
-    component = fixture.componentInstance;
-    component.contact = getNewIdbContact('', '');
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.ts
deleted file mode 100644
index 71858f7e..00000000
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { IconDefinition, faUser } from '@fortawesome/free-solid-svg-icons';
-import { AssessmentIdbService } from 'src/app/indexed-db/assessment-idb.service';
-import { ProcessEquipmentIdbService } from 'src/app/indexed-db/process-equipment-idb.service';
-import { IdbAssessment } from 'src/app/models/assessment';
-import { IdbContact } from 'src/app/models/contact';
-import { IdbProcessEquipment } from 'src/app/models/processEquipment';
-
-@Component({
-  selector: 'app-contact-summary-card',
-  templateUrl: './contact-summary-card.component.html',
-  styleUrl: './contact-summary-card.component.css'
-})
-export class ContactSummaryCardComponent {
-  @Input()
-  contact: IdbContact;
-
-  assessments: Array<IdbAssessment>;
-  processEquipment: Array<IdbProcessEquipment>;
-  faUser: IconDefinition = faUser;
-  constructor(private assessmentIdbService: AssessmentIdbService,
-    private processEquipmentIdbService: ProcessEquipmentIdbService
-  ) {
-  }
-
-  ngOnInit() {
-    this.assessments = this.assessmentIdbService.assessments.getValue();
-    this.processEquipment = this.processEquipmentIdbService.processEquipments.getValue();
-  }
-}
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.html b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.html
index 61742a64..0de9a0ac 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.html
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.html
@@ -1,7 +1,43 @@
-
 <h5 class="bold w-100 text-center"><fa-icon [icon]="faAddressBook" class="me-2"></fa-icon>Stakeholders Details</h5>
-<div class="row">
-    <div class="col-lg-6 col-md-12 pb-2" *ngFor="let contact of contacts">
-        <app-contact-summary-card [contact]="contact"></app-contact-summary-card>
+<ng-template [ngIf]="contacts.length > 0" [ngIfElse]="noContactsBlock">
+    <table class="table table-bordered table-hover table-sm">
+        <thead>
+            <tr>
+                <th class="w-25">
+                    Name
+                </th>
+                <th class="w-25">
+                    Title
+                </th>
+                <th class="w-25">
+                    Team
+                </th>
+                <th class="w-25">
+                    Notes
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let contact of contacts">
+                <td>
+                    {{contact | contactNameDisplay}}
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="contact.role"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="contact.team"></app-single-cell-item>
+                </td>
+                <td>
+                    <app-single-cell-item [strValue]="contact.notes"></app-single-cell-item>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</ng-template>
+
+<ng-template #noContactsBlock>
+    <div class="alert alert-info small p-2">
+        No stakeholders added to this company.
     </div>
-</div>
\ No newline at end of file
+</ng-template>
\ No newline at end of file
diff --git a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.spec.ts b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.spec.ts
index f98ce771..c738d883 100644
--- a/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.spec.ts
+++ b/src/app/setup-wizard/pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component.spec.ts
@@ -1,7 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TeamDetailsSummaryComponent } from './team-details-summary.component';
-import { ContactSummaryCardComponent } from './contact-summary-card/contact-summary-card.component';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { HelperPipesModule } from 'src/app/shared/helper-pipes/_helper-pipes.module';
 import { ContactIdbService } from 'src/app/indexed-db/contact-idb.service';
@@ -24,7 +23,7 @@ describe('TeamDetailsSummaryComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [ FontAwesomeModule, HelperPipesModule],
-      declarations: [TeamDetailsSummaryComponent, ContactSummaryCardComponent],
+      declarations: [TeamDetailsSummaryComponent],
       providers: [
         { provide: ContactIdbService, useValue: contactIdbService },
         { provide: OnSiteVisitIdbService, useValue: onSiteVisitIdbService }
diff --git a/src/app/setup-wizard/setup-wizard.module.ts b/src/app/setup-wizard/setup-wizard.module.ts
index 94fe9e08..f7aade1b 100644
--- a/src/app/setup-wizard/setup-wizard.module.ts
+++ b/src/app/setup-wizard/setup-wizard.module.ts
@@ -17,7 +17,6 @@ import { ContactModalModule } from '../shared/contact-modal/contact-modal.module
 import { ReviewOnSiteComponent } from './data-collection/review-on-site/review-on-site.component';
 import { CompanyDetailsSummaryComponent } from './pre-visit/review-pre-visit-setup/company-details-summary/company-details-summary.component';
 import { TeamDetailsSummaryComponent } from './pre-visit/review-pre-visit-setup/team-details-summary/team-details-summary.component';
-import { ContactSummaryCardComponent } from './pre-visit/review-pre-visit-setup/team-details-summary/contact-summary-card/contact-summary-card.component';
 import { CompanyKpisSummaryComponent } from './pre-visit/review-pre-visit-setup/company-kpis-summary/company-kpis-summary.component';
 import { FacilityDetailsSummaryComponent } from './pre-visit/review-pre-visit-setup/facility-details-summary/facility-details-summary.component';
 import { ProcessEquipmentSummaryComponent } from './pre-visit/review-pre-visit-setup/process-equipment-summary/process-equipment-summary.component';
@@ -46,6 +45,7 @@ import { SharedCompanyFormsModule } from "../shared/shared-company-forms/shared-
 import { SharedFacilityFormsModule } from '../shared/shared-facility-forms/shared-facility-forms.module';
 import { AssessmentEnergyOpportunitiesFormComponent } from './data-collection/on-site-assessment/assessment-energy-opportunities-form/assessment-energy-opportunities-form.component';
 import { CompanyContactsSetupFormComponent } from './pre-visit/company-contacts-setup/company-contacts-setup-form/company-contacts-setup-form.component';
+import { SystemInventorySummaryComponent } from './pre-visit/review-pre-visit-setup/system-inventory-summary/system-inventory-summary.component';
 
 @NgModule({
   declarations: [
@@ -60,7 +60,6 @@ import { CompanyContactsSetupFormComponent } from './pre-visit/company-contacts-
     ReviewOnSiteComponent,
     CompanyDetailsSummaryComponent,
     TeamDetailsSummaryComponent,
-    ContactSummaryCardComponent,
     CompanyKpisSummaryComponent,
     FacilityDetailsSummaryComponent,
     ProcessEquipmentSummaryComponent,
@@ -79,7 +78,8 @@ import { CompanyContactsSetupFormComponent } from './pre-visit/company-contacts-
     OnSiteAssessmentResultsComponent,
     FacilityEnergyEquipmentSetupComponent,
     AssessmentEnergyOpportunitiesFormComponent,
-    CompanyContactsSetupFormComponent
+    CompanyContactsSetupFormComponent,
+    SystemInventorySummaryComponent
   ],
   imports: [
     CommonModule,
diff --git a/src/app/spec-helpers/spec-test-service-stub.ts b/src/app/spec-helpers/spec-test-service-stub.ts
index c8299bc6..083a0962 100644
--- a/src/app/spec-helpers/spec-test-service-stub.ts
+++ b/src/app/spec-helpers/spec-test-service-stub.ts
@@ -130,7 +130,8 @@ let stubProcessEquipment: IdbProcessEquipment = getNewIdbProcessEquipment('123',
 stubProcessEquipment.guid = '123';
 let processEquipmentIdbService: Partial<ProcessEquipmentIdbService> = {
     processEquipments: new BehaviorSubject<Array<IdbProcessEquipment>>([stubProcessEquipment]),
-    getByGuid: () => { return stubProcessEquipment }
+    getByGuid: () => { return stubProcessEquipment },
+    getFacilityProcessEquipment: () => { return [stubProcessEquipment] }
 }
 
 let stubKpiImpact: IdbKeyPerformanceMetricImpact = getNewIdbKeyPerformanceMetricImpact('123', '123', '123', '123', '123', 'TRIR', '123', '123', '123');