diff --git a/app/pods/protected/strains/show/loading/template.hbs b/app/pods/protected/strains/show/loading/template.hbs
new file mode 100644
index 0000000..e5a3e05
--- /dev/null
+++ b/app/pods/protected/strains/show/loading/template.hbs
@@ -0,0 +1 @@
+{{loading-panel}}
diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/show/measurements-table/component.js
new file mode 100644
index 0000000..bddc5d1
--- /dev/null
+++ b/app/pods/protected/strains/show/measurements-table/component.js
@@ -0,0 +1,25 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  measurementsPresent: function() {
+    return this.get('model.measurements.length') > 0;
+  }.property('model.measurements'),
+
+  measurementsTable: function() {
+    let measurements = this.get('model.measurements');
+    let table = [];
+    measurements.forEach((measurement) => {
+      let row = {};
+      row['measurement'] = measurement;
+      row['characteristic'] = this.store.peekRecord('characteristic', measurement.get('characteristic.id'));
+      table.push(row);
+    });
+    table.sort((a, b) => {
+      let a_sort = a['characteristic'] && a['characteristic'].get('sortOrder');
+      let b_sort = b['characteristic'] && b['characteristic'].get('sortOrder');
+      return a_sort - b_sort;
+    });
+    return table;
+  }.property(),
+
+});
diff --git a/app/pods/protected/strains/show/measurements-table/loading/template.hbs b/app/pods/protected/strains/show/measurements-table/loading/template.hbs
new file mode 100644
index 0000000..e5a3e05
--- /dev/null
+++ b/app/pods/protected/strains/show/measurements-table/loading/template.hbs
@@ -0,0 +1 @@
+{{loading-panel}}
diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/show/measurements-table/template.hbs
new file mode 100644
index 0000000..188ac47
--- /dev/null
+++ b/app/pods/protected/strains/show/measurements-table/template.hbs
@@ -0,0 +1,30 @@
+{{#if measurementsPresent}}
+<table class="flakes-table">
+  <thead>
+    <tr>
+      <th>Characteristic</th>
+      <th>Value</th>
+      <th>Notes</th>
+    </tr>
+  </thead>
+  <tbody>
+    {{#each measurementsTable as |row|}}
+      <tr>
+        <td>
+          {{#link-to 'protected.characteristics.show' row.characteristic.id}}
+            {{{row.characteristic.characteristicName}}}
+          {{/link-to}}
+        </td>
+        <td>
+          {{row.measurement.value}}
+        </td>
+        <td>
+          {{row.measurement.notes}}
+        </td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>
+{{else}}
+No measurements on record.
+{{/if}}
diff --git a/app/pods/protected/strains/show/template.hbs b/app/pods/protected/strains/show/template.hbs
index 55b2bff..7504458 100644
--- a/app/pods/protected/strains/show/template.hbs
+++ b/app/pods/protected/strains/show/template.hbs
@@ -59,12 +59,26 @@
       <dl class="span-1">
         <dt>Notes</dt>
         <dd>
-          {{{model.notes}}}
+          {{#if model.notes}}
+            {{{model.notes}}}
+          {{else}}
+            No notes.
+          {{/if}}
         </dd>
       </dl>
     </div>
 
     {{! ROW 5 }}
+    <div class="grid-1 gutter-20">
+      <dl class="span-1">
+        <dt>Characteristics</dt>
+        <dd>
+          {{protected/strains/show/measurements-table model=model}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 6 }}
     <div class="grid-3 gutter-20">
       <dl class="span-1">
         <dt>Record Created</dt>