diff --git a/todos/src/list-item.jsx b/todos/src/list-item.jsx
index 19e8951..82a9ad8 100644
--- a/todos/src/list-item.jsx
+++ b/todos/src/list-item.jsx
@@ -23,6 +23,7 @@ module.exports = React.createClass({
           />
       </span>
       <input type="text"
+        disabled={this.state.done}
         className="form-control"
         value={this.state.text}
         onChange={this.handleTextChange}
@@ -42,12 +43,32 @@ module.exports = React.createClass({
     if(!this.state.textChanged) {
       return null
     } else {
-      return <span>
-        <button className="btn btn-default">Save</button>
-        <button className="btn btn-default">Undo</button>
-      </span>
+      return [
+        <button
+          className="btn btn-default"
+          onClick={this.handleSaveClick}
+          >
+          Save
+        </button>,
+        <button
+          onClick={this.handleUndoClick}
+          className="btn btn-default"
+          >
+          Undo
+        </button>
+      ]
     }
   },
+  handleSaveClick: function() {
+    this.fb.update({text: this.state.text});
+    this.setState({textChanged: false});
+  },
+  handleUndoClick: function() {
+    this.setState({
+      text: this.props.item.text,
+      textChanged: false
+    });
+  },
   handleTextChange: function(event) {
     this.setState({
       text: event.target.value,