diff --git a/app/controllers/ApiController.php b/app/controllers/ApiController.php
index 31cffb27..98960ad2 100644
--- a/app/controllers/ApiController.php
+++ b/app/controllers/ApiController.php
@@ -19,4 +19,16 @@
 			return $component->incidents;
 		}
 
+		public function getIncidents() {
+			return Incident::all();
+		}
+
+		public function getIncident($id) {
+			if ($incident = Incident::find($id)) {
+				return $incident;
+			} else {
+				App::abort(404, 'Incident not found');
+			}
+		}
+
 	}
diff --git a/app/models/Component.php b/app/models/Component.php
index 9c429b8e..337cf371 100644
--- a/app/models/Component.php
+++ b/app/models/Component.php
@@ -20,7 +20,7 @@
 		/**
 		 * Get the transformer instance.
 		 *
-		 * @return mixed
+		 * @return ComponentTransformer
 		 */
 		public function getTransformer() {
 			return new ComponentTransformer();
diff --git a/app/models/Incident.php b/app/models/Incident.php
index a92a5b12..8f1ac425 100644
--- a/app/models/Incident.php
+++ b/app/models/Incident.php
@@ -1,6 +1,6 @@
 <?php
 
-	class Incident extends Eloquent {
+	class Incident extends Eloquent implements Dingo\Api\Transformer\TransformableInterface {
 		/**
 		 * An incident belongs to a component.
 		 * @return Illuminate\Database\Eloquent\Relations
@@ -29,4 +29,13 @@
 				case 4: return 'glyphicon-ok';
 			}
 		}
+
+		/**
+		 * Get the transformer instance.
+		 *
+		 * @return IncidentTransformer
+		 */
+		public function getTransformer() {
+			return new IncidentTransformer();
+		}
 	}
diff --git a/app/routes/api.php b/app/routes/api.php
index dda32400..3f55953f 100644
--- a/app/routes/api.php
+++ b/app/routes/api.php
@@ -5,5 +5,7 @@
 		Route::get('components', 'ApiController@getComponents');
 		Route::get('components/{id}', 'ApiController@getComponent');
 		Route::get('components/{id}/incidents', 'ApiController@getComponentIncidents');
+		Route::get('incidents', 'ApiController@getIncidents');
+		Route::get('incidents/{id}', 'ApiController@getIncident');
 
 	});
diff --git a/app/transformers/ComponentTransformer.php b/app/transformers/ComponentTransformer.php
index c586998a..46b619f5 100644
--- a/app/transformers/ComponentTransformer.php
+++ b/app/transformers/ComponentTransformer.php
@@ -8,8 +8,9 @@
 				'description' => $component->description,
 				'status_id' => (int) $component->status,
 				'status' => $component->getHumanStatusAttribute(),
-				'incident_count' => $component->incidents()->count()
+				'incident_count' => $component->incidents()->count(),
+				'created_at' => $component->created_at->timestamp,
+				'updated_at' => $component->updated_at->timestamp,
 			];
 		}
-
 	}
diff --git a/app/transformers/IncidentTransformer.php b/app/transformers/IncidentTransformer.php
new file mode 100644
index 00000000..ab1f6b5f
--- /dev/null
+++ b/app/transformers/IncidentTransformer.php
@@ -0,0 +1,19 @@
+<?php
+
+	class IncidentTransformer extends \League\Fractal\TransformerAbstract {
+		public function transform(Incident $incident) {
+			$component = $incident->parent;
+			$transformer = $component->getTransformer();
+
+			return [
+				'id' => (int) $incident->id,
+				'name' => $incident->name,
+				'message' => $incident->message,
+				'status_id' => (int) $incident->status,
+				'status' => $incident->getHumanStatusAttribute(),
+				'component' => $transformer->transform($component),
+				'created_at' => $incident->created_at->timestamp,
+				'updated_at' => $incident->updated_at->timestamp,
+			];
+		}
+	}