diff --git a/app/routes/lab-mashup.js b/app/routes/lab-mashup.js
index 52a6bc4..e5f520a 100644
--- a/app/routes/lab-mashup.js
+++ b/app/routes/lab-mashup.js
@@ -6,11 +6,13 @@ export default Ember.Route.extend({
 		let properties = [
 			{
 				name: "voltage",
-				value: 2.3
+				value: 2.3,
+				type: "kV"
 			},
 			{
-				nane: "current",
-				value: 1.6
+				name: "current",
+				value: 1.6,
+				type: "A"
 			}
 		];
 		
diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs
index d32b2b9..5a6dfe2 100644
--- a/app/templates/lab-mashup.hbs
+++ b/app/templates/lab-mashup.hbs
@@ -4,13 +4,11 @@
 			<th>Name</th>
 			<th>Value</th>
 		</tr>
-		<tr>
-			<td>Voltage</td>
-			<td>2.34 kV</td>
-		</tr>
-		<tr>
-			<td>Current</td>
-			<td>7.6 A</td>
-		</tr>
+		{{#each model as |property|}}
+			<tr>
+				<td>{{property.name}}</td>
+				<td>{{property.value}} {{property.type}}</td>
+			</tr>
+		{{/each}}
 	</table>
 </section>