diff --git a/app/pods/protected/strains/show/measurements-table-row/component.js b/app/pods/protected/strains/show/measurements-table-row/component.js
new file mode 100644
index 0000000..f973194
--- /dev/null
+++ b/app/pods/protected/strains/show/measurements-table-row/component.js
@@ -0,0 +1,17 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  tagName: 'tr',
+  isEditing: false,
+
+  actions: {
+    edit: function() {
+      this.toggleProperty('isEditing');
+    },
+
+    save: function() {
+      this.toggleProperty('isEditing');
+      console.log('saved');
+    }
+  },
+});
diff --git a/app/pods/protected/strains/show/measurements-table-row/template.hbs b/app/pods/protected/strains/show/measurements-table-row/template.hbs
new file mode 100644
index 0000000..b4f258e
--- /dev/null
+++ b/app/pods/protected/strains/show/measurements-table-row/template.hbs
@@ -0,0 +1,37 @@
+{{#if isEditing}}
+  <td>
+    {{input value='Foo'}}
+  </td>
+  <td>
+    {{input value='Bar'}}
+  </td>
+  <td>
+    {{input value='Baz'}}
+  </td>
+  {{#if canEdit}}
+    <td>
+      <button class="button-gray smaller" {{action 'save'}}>
+        Save
+      </button>
+    </td>
+  {{/if}}
+{{else}}
+  <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>
+  {{#if canEdit}}
+    <td>
+      <button class="button-gray smaller" {{action 'edit'}}>
+        Edit
+      </button>
+    </td>
+  {{/if}}
+{{/if}}
diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/show/measurements-table/template.hbs
index 188ac47..c00490d 100644
--- a/app/pods/protected/strains/show/measurements-table/template.hbs
+++ b/app/pods/protected/strains/show/measurements-table/template.hbs
@@ -1,27 +1,34 @@
 {{#if measurementsPresent}}
 <table class="flakes-table">
+  <colgroup>
+    {{#if canEdit}}
+      <col span="1" style="width:40%">
+      <col span="1" style="width:20%">
+      <col span="1" style="width:30%">
+      <col span="1" style="width:10%">
+    {{else}}
+      <col span="1" style="width:40%">
+      <col span="1" style="width:30%">
+      <col span="1" style="width:30%">
+    {{/if}}
+  </colgroup>
   <thead>
     <tr>
       <th>Characteristic</th>
       <th>Value</th>
       <th>Notes</th>
+      {{#if canEdit}}
+      <th>Edit</th>
+      {{/if}}
     </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>
+      {{
+        protected/strains/show/measurements-table-row
+        row=row
+        canEdit=canEdit
+      }}
     {{/each}}
   </tbody>
 </table>
diff --git a/app/pods/protected/strains/show/template.hbs b/app/pods/protected/strains/show/template.hbs
index cf07781..dbe09fe 100644
--- a/app/pods/protected/strains/show/template.hbs
+++ b/app/pods/protected/strains/show/template.hbs
@@ -73,7 +73,11 @@
       <dl class="span-1">
         <dt>Characteristics</dt>
         <dd>
-          {{protected/strains/show/measurements-table model=model}}
+          {{
+            protected/strains/show/measurements-table
+            model=model
+            canEdit=false
+          }}
         </dd>
       </dl>
     </div>
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index 79acd02..8260411 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -49,6 +49,13 @@
       </div>
     </div>
   </fieldset>
+  <div>
+    {{
+      protected/strains/show/measurements-table
+      model=strain
+      canEdit=strain.canEdit
+    }}
+  </div>
   <br>
   <a class="button-red smaller" {{action 'cancel'}}>
     Cancel
diff --git a/app/styles/app.css b/app/styles/app.css
index 332f3c8..4116537 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -1,3 +1,10 @@
+input[type="text"] {
+     width: 100%;
+     box-sizing: border-box;
+     -webkit-box-sizing:border-box;
+     -moz-box-sizing: border-box;
+}
+
 .ql-editor {
   font-size: 18px;
 }