diff --git a/src/app/statistics/statistics.component.css b/src/app/statistics/statistics.component.css
index a2248be..a16be29 100644
--- a/src/app/statistics/statistics.component.css
+++ b/src/app/statistics/statistics.component.css
@@ -21,8 +21,31 @@ mwl-gauge > .gauge > .value-text {
   font-weight: bold;
   font-size: 1em;
 }
-.fusioncharts
+
+h6
 {
-  position: relative;
-  padding: 5px;
+  font-size: 13px;
 }
+.faults
+{
+  font-size: 14px;
+}
+.status
+{
+  font-size: 14px;
+}
+.gauges
+{
+    display: flex;
+    justify-content: center;margin-right: auto;
+    margin-left: auto;
+}
+.badge
+{
+  display:inline-block; 
+  width:100%;
+  padding: 8px;
+  height: 100%;
+  height: 46px;
+}
+
diff --git a/src/app/statistics/statistics.component.html b/src/app/statistics/statistics.component.html
index 26e1388..b01f43d 100644
--- a/src/app/statistics/statistics.component.html
+++ b/src/app/statistics/statistics.component.html
@@ -24,35 +24,35 @@
     <button class="btn btn-primary btn-block m-1" (click) = "goToGraphGen()">Graph</button>
 
   </div>
-    <div class="row mt-3 text-center " *ngIf = "isRecent">
-      
-      <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('l1.current')">
-          <radial-gauge  width="200" units="Amps" title="Phase A Current" height="200" major-ticks="0,60,120,180,240,300" [value]="pACurrent" >
-          </radial-gauge>
-        </div>
-        <div *ngIf="pACurrent; else loggedOut">          
+  <div class = "row mt-3">
+    <div class = "col-lg-8">
+      <div class = "row">
+        <div class="col-md-4 p-4">
+          <div (click)= "goToGraphSpec('l1.current')">
+            <radial-gauge class = "gauges"  width="200" units="Amps" title="Phase A Current" height="200" major-ticks="0,60,120,180,240,300" max-value = '300' highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="pACurrent" >
+            </radial-gauge>
           </div>
-      </div>
-      <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('l2.current')">
-          <radial-gauge width="200" units="°C" title="Phase B Current" height="200" major-ticks="0,60,120,180,240,300" [value]="pBCurrent">
-          </radial-gauge>
+          <div *ngIf="pACurrent; else loggedOut"></div>
         </div>
-        <div *ngIf="pBCurrent; else loggedOut">          
+        <div class="col-md-4 p-4">
+          <div (click)= "goToGraphSpec('l2.current')">
+            <radial-gauge class = "gauges"  width="200" units="Amps" title="Phase B Current" height="200" major-ticks="0,60,120,180,240,300" max-value = '300' highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="pBCurrent">
+            </radial-gauge>
           </div>
-      </div>
-      <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('l3.current')">
-          <radial-gauge width="200" units="°C" title="Phase C Current" height="200" major-ticks="0,60,120,180,240,300" [value]="pCCurrent">
-          </radial-gauge>
+          <div *ngIf="pBCurrent; else loggedOut">          
+            </div>
         </div>
-        <div *ngIf="pCCurrent; else loggedOut">          
+        <div class="col-md-4 p-4">
+          <div (click)= "goToGraphSpec('l3.current')">
+            <radial-gauge class = "gauges"  width="200" units="Amps" title="Phase C Current" height="200" major-ticks="0,60,120,180,240,300" max-value = '300' highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="pCCurrent">
+            </radial-gauge>
           </div>
-      </div>
-      <div class="col-md-4 p-4">
+          <div *ngIf="pCCurrent; else loggedOut">          
+            </div>
+        </div>
+        <div class="col-md-4 p-4">
         <div (click)= "goToGraphSpec('engine.rpm')">
-          <radial-gauge width="200" units="RPM" title="Engine Speed" height="200" major-ticks="0,375,750,1125,1500,1875, 2250, 2625,3000" max-value = "3000" [value]="engineSpeed">
+          <radial-gauge class = "gauges"  width="200" units="RPM" title="Engine Speed" height="200" major-ticks="0,375,750,1125,1500,1875, 2250, 2625,3000" max-value = "3000" highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="engineSpeed">
           </radial-gauge>
         </div>
         <div *ngIf="engineSpeed; else loggedOut">          
@@ -60,7 +60,7 @@
       </div>
       <div class="col-md-4 p-4">
         <div (click)= "goToGraphSpec('fuel.pressure')">
-          <radial-gauge width="200" units="%" title="Fuel Pressure" height="200" major-ticks="0,12.5,25,37.5,50,62.5,75,87.5,100" max-value = "100" [value]="fuelPressure">
+          <radial-gauge class = "gauges"  width="200" units="kPa/psi" title="Fuel Pressure" height="200" major-ticks="0,12.5,25,37.5,50,62.5,75,87.5,100" max-value = "100" highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="fuelPressure">
           </radial-gauge>
         </div>
         <div *ngIf="fuelPressure; else loggedOut">          
@@ -68,7 +68,7 @@
       </div>
       <div class="col-md-4 p-4">
         <div (click)= "goToGraphSpec('l1.l0.voltage')">
-          <radial-gauge width="200" units="Volts" title="Phase A Voltage" height="200" major-ticks="0,60,120,180,240,300" max-value = "300" [value]="pAVoltage">
+          <radial-gauge class = "gauges"  width="200" units="Volts" title="Phase A Voltage" height="200" major-ticks="0,60,120,180,240,300" max-value = "300" highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="pAVoltage">
           </radial-gauge>
         </div>
         <div *ngIf="pAVoltage; else loggedOut">          
@@ -76,7 +76,7 @@
       </div>
       <div class="col-md-4 p-4">
         <div (click)= "goToGraphSpec('l2.l0.voltage')">
-          <radial-gauge width="200" units="Volts" title="Phase B Voltage" height="200" major-ticks="0,60,120,180,240,300" max-value = "300" [value]="pBVoltage">
+          <radial-gauge class = "gauges"  width="200" units="Volts" title="Phase B Voltage" height="200" major-ticks="0,60,120,180,240,300" max-value = "300" highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="pBVoltage">
           </radial-gauge>
         </div>
         <div *ngIf="pBVoltage; else loggedOut">          
@@ -84,7 +84,7 @@
       </div>
       <div class="col-md-4 p-4">
         <div (click)= "goToGraphSpec('l3.l0.voltage')">
-          <radial-gauge width="200" units="Volts" title="Phase C Voltage" height="200" major-ticks="0,60,120,180,240,300" max-value = "300" [value]="pCVoltage">
+          <radial-gauge class = "gauges"  width="200" units="Volts" title="Phase C Voltage" height="200" major-ticks="0,60,120,180,240,300" max-value = "300" highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="pCVoltage">
           </radial-gauge>
         </div>
         <div *ngIf="pCVoltage; else loggedOut">          
@@ -92,31 +92,117 @@
       </div>
       <div class="col-md-4 p-4">
         <div (click)= "goToGraphSpec('total.kw')">
-          <radial-gauge width="200" units="Volts" title="Total kiloWatt" height="200" major-ticks="0,125,250,375,500,625,750, 875, 1000" max-value = "1000" [value]="totalKw">
+          <radial-gauge  class = "gauges"  width="200" units="kW" title="Total kiloWatt" height="200" major-ticks="0,125,250,375,500,625,750, 875, 1000" max-value = "1000" highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="totalKw">
           </radial-gauge>
         </div>
         <div *ngIf="totalKw; else loggedOut">          
           </div>
+      </div>  
       </div>
-       <!--<div class="col-md-4">
-        <div class = "fusioncharts">
-          <fusioncharts class = "fusioncharts"  type="angulargauge"  dataFormat="json" width= "100%" height = "230" [dataSource]="fuelTempGraphData" >
+    </div>
 
-          </fusioncharts>
+    <div class = "col-lg-4 p-4 text-center">
+      <div class = "row ">
+        <div class = "col-md-12 ">
+          <h3 class = "p-3">Faults</h3>
+        </div>
+        <div class = "col-md-6">
+          <h5 *ngIf = "this.generator.fault_codes.includes('fault.overcrank'); else emptyOvercrank"><span class="badge badge-danger">Overcrank</span></h5>
+          <ng-template #emptyOvercrank>
+             <h5><span class="badge badge-secondary">Overcrank</span></h5> 
+          </ng-template>
+        </div>
+        <div class = "col-md-6">  
+          <h5 *ngIf = "this.generator.fault_codes.includes('fault.engine.temp.high'); else emptyEngine"><span class="badge badge-danger">High Engine<br>Temperature</span></h5>
+          <ng-template #emptyEngine>
+             <h5><span class="badge badge-secondary">High Engine<br>Temperature</span></h5> 
+          </ng-template>   
+        </div>
+        <div class = "col-md-6">
+          <h5 *ngIf = "this.generator.fault_codes.includes('fault.oil.pressure.low'); else emptyOil"><span class="badge badge-danger">Low Oil<br>Pressure</span></h5>
+          <ng-template #emptyOil>
+             <h5><span class="badge badge-secondary">Low Oil<br>Pressure</span></h5> 
+          </ng-template> 
+        </div>
+        <div class = "col-md-6">  
+           <h5 *ngIf = "this.generator.fault_codes.includes('fault.overspeed'); else emptyOverspeed"><span class="badge badge-danger">Overspeed</span></h5> 
+           <ng-template #emptyOverspeed>
+             <h5><span class="badge badge-secondary">Overspeed</span></h5> 
+          </ng-template>  
+        </div>
+        <div class = "col-md-6">
+           <h5 *ngIf = "this.generator.fault_codes.includes('fault.emstop'); else emptyEmergency"><span class="badge badge-danger">Emergency Stop</span></h5>
+           <ng-template #emptyEmergency>
+             <h5><span class="badge badge-secondary">Emergency Stop</span></h5> 
+          </ng-template> 
         </div>
+        <div class = "col-md-6">  
+          <h5 *ngIf = "this.generator.fault_codes.includes('fault.fuel.low'); else emptyLowFuel"><span class="badge badge-danger">Low Fuel</span></h5>
+          <ng-template #emptyLowFuel>
+             <h5><span class="badge badge-secondary">Low Fuel</span></h5> 
+          </ng-template>     
+        </div>
+        <div class = "col-md-6">
+          <h5 *ngIf = "this.generator.fault_codes.includes('fault.coolant.level.low'); else emptyLowCoolant"><span class="badge badge-danger">Low Coolant<br>Level/Aux</span></h5>
+          <ng-template #emptyLowCoolant>
+             <h5><span class="badge badge-secondary">Low Coolant<br>Level/Aux</span></h5> 
+          </ng-template> 
+        </div>
+        <div class = "col-md-6">  
+          <h5 *ngIf = "this.generator.fault_codes.includes('fault.crank.volt.low'); else emptyLowCranking"><span class="badge badge-danger">Low Cranking<br>Voltage</span></h5>
+          <ng-template #emptyLowCranking>
+             <h5><span class="badge badge-secondary">Low Cranking<br>Voltage</span></h5> 
+          </ng-template>  
+        </div>
+        <div class = "col-md-6">
+          <h5 *ngIf = "this.generator.fault_codes.includes('fault.batt.volt.low') || this.generator.fault_codes.includes('fault.batt.volt.high'); else emptyBatteryVolt"><span class="badge badge-danger">Battery Voltage<br>(Hi/Lo)</span></h5>
+          <ng-template #emptyBatteryVolt>
+             <h5><span class="badge badge-secondary">Battery Voltage<br>(Hi/Lo)</span></h5> 
+          </ng-template> 
+        </div>        
+        <div class = "col-md-6">
+          <h5 *ngIf = "this.generator.fault_codes.includes('fault.common'); else emptyCommon"><span class="badge badge-danger">Common Fault</span></h5>
+          <ng-template #emptyCommon>
+             <h5><span class="badge badge-secondary">Common Fault</span></h5> 
+          </ng-template> 
+        </div>        
       </div>
-       <div class="col-md-4">
-        <div class = "fusioncharts">
-          <fusioncharts class = "fusioncharts"  type="angulargauge"  dataFormat="json" width= "100%" height = "230" [dataSource]="fuelTempGraphData" >
-
-          </fusioncharts>
+      <div class = "row status ">
+        <div class = "col-md-12 ">
+          <h3 class = "p-3">System Status</h3>          
         </div>
-      </div>   -->
-    </div>
-    <div class="row mt-3 text-center" *ngIf = "isRecent">
+        <div class = "col-md-6">
+          <h5 *ngIf = "this.generator.status_codes.includes('status.eps'); else emptyEPS"><span class="badge badge-success">EPS Supplying<br>Load</span></h5>
+          <ng-template #emptyEPS>
+             <h5><span class="badge badge-secondary">EPS Supplying<br>Load</span></h5> 
+          </ng-template> 
+        </div>
+        <div class = "col-md-6">  
+          <h5 *ngIf = "this.generator.status_codes.includes('status.notinauto'); else emptyAuto"><span class="badge badge-success">Not-In-Auto</span></h5>
+          <ng-template #emptyAuto>
+             <h5><span class="badge badge-secondary">Not-In-Auto</span></h5> 
+          </ng-template>     
+        </div>
+        <div class = "col-md-6">
+          <h5 *ngIf = "this.generator.status_codes.includes('status.system.ready'); else emptySystem"><span class="badge badge-success">System Ready</span></h5>
+          <ng-template #emptySystem>
+             <h5><span class="badge badge-secondary">System Running</span></h5> 
+          </ng-template>   
+        </div>
+        <div class = "col-md-6">  
+          <h5 *ngIf = "this.generator.status_codes.includes('status.gen.running'); else emptyGenerator"><span class="badge badge-success">Generator<br>Running</span></h5>
+          <ng-template #emptyGenerator>
+             <h5><span class="badge badge-secondary">Generator<br>Running</span></h5> 
+          </ng-template>    
+        </div>
+              
+      </div>
+  </div>
+</div>
+  <div class="row mt-3 text-center">
        <div class="col-md-3 p-4">
         <div (click)= "goToGraphSpec('coolant.temp')">
-          <linear-gauge width="150" title = "Coolant Temperature" major-ticks = "0,30,60,90,120" max-value = "120" height="350" [value] = "coolantTemp">
+          <linear-gauge width="150" title = "Coolant Temperature" major-ticks = "0,30,60,90,120" units = "°F" max-value = "120" height="350" highlights = '[{"from": 0, "to": 0, "color": black}]' [value] = "coolantTemp">
             
           </linear-gauge>
         </div>
@@ -129,7 +215,7 @@
       <div class="col-md-3 p-4">
         <!--<radial-gauge width="200" units="°C" title="Fuel Temperature" height="200" [value]="fuelTemp"></radial-gauge> -->
         <div (click)= "goToGraphSpec('oil.pressure')">
-          <linear-gauge width="150" title = "Oil Pressure" major-ticks = "0,50,100,150,200" max-value = "200" height="350" [value] = "oilPressure">          
+          <linear-gauge width="150" title = "Oil Pressure" major-ticks = "0,50,100,150,200" units = "kPa/psi"  max-value = "200" height="350" highlights = '[{"from": 0, "to": 0, "color": black}]' [value] = "oilPressure">          
           </linear-gauge>
         </div>
         <div *ngIf="oilPressure; else loggedOut">          
@@ -138,7 +224,7 @@
       <div class="col-md-3 p-4">
           <!--<radial-gauge width="200" units="°C" title="Fuel Temperature" height="200" [value]="fuelTemp"></radial-gauge> -->
         <div (click)= "goToGraphSpec('oil.temp')">
-          <linear-gauge width="150" title = "Oil Temperature" major-ticks = "0,50,100,150,200" max-value = "200" height="350" [value]="oilTemp"></linear-gauge>
+          <linear-gauge width="150" title = "Oil Temperature" major-ticks = "0,50,100,150,200" units = "°F" max-value = "200" height="350" highlights = '[{"from": 0, "to": 0, "color": black}]' [value]="oilTemp"></linear-gauge>
         </div>
         <div *ngIf="oilTemp; else loggedOut">          
           </div>
@@ -146,7 +232,7 @@
       <div class="col-md-3 p-4">
           <!--<radial-gauge width="200" units="°C" title="Fuel Temperature" height="200" [value]="fuelTemp"></radial-gauge> -->        
         <div  (click)= "goToGraphSpec('fuel.temp')">  
-          <linear-gauge width="150" title = "Fuel Temperature" major-ticks = "0,50,100,150,200" max-value = "200" height="350" [value]= "fuelTemp" >
+          <linear-gauge width="150" title = "Fuel Temperature" major-ticks = "0,50,100,150,200" units = "°F" max-value = "200" height="350" highlights = '[{"from": 0, "to": 0, "color": black}]' [value]= "fuelTemp" >
             
           </linear-gauge>          
         </div>
@@ -154,9 +240,19 @@
           </div>
       </div>
     </div>
+
+
+
+   
+      
+      
+    
     <ng-template #loggedOut>
       Data is not available within the last 24 hours 
     </ng-template>
+    
+  </div>
+
 <!--   
     <div class="row mt-3 text-center" *ngIf = "isHour">
       <div class="col-md-4">
diff --git a/src/app/statistics/statistics.component.ts b/src/app/statistics/statistics.component.ts
index 6ea5ee5..c9bb285 100644
--- a/src/app/statistics/statistics.component.ts
+++ b/src/app/statistics/statistics.component.ts
@@ -3,6 +3,8 @@ import {MetricsService} from '../services/metrics.service';
 import {HttpClient, HttpHeaders} from '@angular/common/http';
 import { Router } from '@angular/router';
 import {LoginService} from '../services/login.service';
+import { GeneratorState } from '../generator-object';
+import { GeneratorService } from '../services/generator.service';
 
 @Component({
   selector: 'app-statistics',
@@ -12,7 +14,7 @@ import {LoginService} from '../services/login.service';
 export class StatisticsComponent implements OnInit {
 
 
-  constructor(public data: MetricsService, private http: HttpClient, private router: Router, private login: LoginService) {
+  constructor(public data: MetricsService, public data2: GeneratorService, private http: HttpClient, private router: Router, private login: LoginService) {
 
 
 
@@ -51,15 +53,11 @@ export class StatisticsComponent implements OnInit {
   public metricYearAvg: any;
   public fuelTempYearAvg: any;
 
-  public isRecent: boolean = true;
-  public isHour: boolean = false;
-  public isDay: boolean = false;
-  public isWeek: boolean = false;
-  public isMonth: boolean = false;
-  public isYear: boolean = false;
 
   
 
+  public generator : GeneratorState;
+
   goToGraphGen()
   {
   	this.router.navigateByUrl('/visualize-one');
@@ -71,55 +69,22 @@ export class StatisticsComponent implements OnInit {
   	localStorage.setItem('data_type', dataType);
   }
   
-  lengthCheck(metricArray)
-  {
-  	if (metricArray.length == 0)
-    {
-        return null;
-
-    }
-    else
-    {
-    	return metricArray[0][1];
-    }
-  	
-  }
-  setCheck(metricArray)
-  {
-  	if(metricArray.length == 0)
-  	{
-  		console.log(false)
-  		return false;
-  	}
-  	else
-  	{
-  		console.log(true);
-  		return true;
-  	}
-  }
-  
+ 
+   
 
   async ngOnInit() {
 
     localStorage.removeItem('data_type');
     localStorage.removeItem('fault_type');
     const jsonToken = await this.login.getToken();
-
+    const gen_id = parseInt(localStorage.getItem('gen_id'),10);
+    
    
 
     try {
       this.data.getDevMetrics(jsonToken).subscribe((data) => {
-        //console.log(data.outputs[1].dps[0][1]);
-        this.metric = data;
-        console.log(this.metric.outputs[0].dps.length == 0);
-
-        
         
-        this.fuelTemp = this.lengthCheck(this.metric.outputs[0].dps);
-        this.fuelTempCheck = this.setCheck(this.metric.outputs[0].dps);
-        console.log(this.fuelTempCheck);
-
-        //this.fuelTemp = this.metric.outputs[0].dps[0][1];
+        this.metric = data;           
         this.oilTemp = this.metric.outputs[1].dps[0][1];
         this.pACurrent = this.metric.outputs[2].dps[0][1];
         this.pBCurrent = this.metric.outputs[3].dps[0][1];
@@ -138,9 +103,17 @@ export class StatisticsComponent implements OnInit {
         
 
       });
+
+      
+      this.generator = await this.data2.getGeneratorState(gen_id,jsonToken);
+
+      
+           
+      
     } catch (err) {
       return err;
     }
+
     try {
 
       this.data.getYearMetrics(jsonToken).subscribe((data) => {