diff --git a/app/models/Incident.php b/app/models/Incident.php
index 14ac91ee..f631670b 100644
--- a/app/models/Incident.php
+++ b/app/models/Incident.php
@@ -1,5 +1,12 @@
 <?php
 
 	class Incident extends Eloquent {
-
+		public function getHumanStatusAttribute() {
+			switch ($this->status) {
+				case 1: return 'Investigating';
+				case 2: return 'Identified';
+				case 3: return 'Watching';
+				case 4: return 'Fixed';
+			}
+		}
 	}
diff --git a/app/views/incident.blade.php b/app/views/incident.blade.php
index 47b2396b..319e778a 100644
--- a/app/views/incident.blade.php
+++ b/app/views/incident.blade.php
@@ -10,7 +10,7 @@
 	@else
 	@foreach($incidents as $incident)
 	<li>
-		<h2>{{ $incident->name }}</h2>
+		<h2>{{ $incident->name }}, <small>{{ $incident->humanStatus }}</small></h2>
 		<h3><time>{{ $incident->created_at->format('H:i:s A') }}</time></h3>
 		<p>{{ $incident->message }}</p>
 	</li>
diff --git a/app/views/index.blade.php b/app/views/index.blade.php
index 1c2ec1e8..7611615a 100644
--- a/app/views/index.blade.php
+++ b/app/views/index.blade.php
@@ -2,7 +2,23 @@
 
 @section('content')
 	<ul>
-	@for ($i=0; $i <= 7; $i++)
+		@foreach(Component::get() as $component)
+		<li>
+			{{ $component->name }}
+			@if($component->description)
+			<small>{{ $component->description }}</small>
+			@endif
+
+			<span class='pull-right'>
+				{{ $component->humanStatus }}
+			</span>
+		</li>
+		@endforeach
+	</ul>
+
+	<h1>Past Incidents</h1>
+	<ul>
+	@for($i=0; $i <= 7; $i++)
 		@include('incident', array('i', $i))
 	@endfor
 	</ul>