diff --git a/comments.json b/comments.json
index 7bef77ad..6a79ff82 100644
--- a/comments.json
+++ b/comments.json
@@ -8,5 +8,20 @@
         "id": 1420070400000,
         "author": "Paul O’Shannessy",
         "text": "React is *great*!"
+    },
+    {
+        "id": 1464386432512,
+        "author": "test",
+        "text": "cool"
+    },
+    {
+        "id": 1464386437963,
+        "author": "wait",
+        "text": "what"
+    },
+    {
+        "id": 1464386618159,
+        "author": "final",
+        "text": "test"
     }
-]
+]
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 34ebddf4..4fc4a6de 100644
--- a/public/index.html
+++ b/public/index.html
@@ -13,7 +13,8 @@
   </head>
   <body>
     <div id="content"></div>
-    <script type="text/babel" src="http://github.com/scripts/example.js"></script>
+    <!-- <script type="text/babel" src="http://github.com/scripts/example.js"></script> -->
+    <script type="text/babel" src="http://github.com/scripts/daves-code.js"></script>
     <script type="text/babel">
       // To get started with this tutorial running your own code, simply remove
       // the script tag loading scripts/example.js and start writing code here.
diff --git a/public/scripts/daves-code.js b/public/scripts/daves-code.js
new file mode 100644
index 00000000..937b9888
--- /dev/null
+++ b/public/scripts/daves-code.js
@@ -0,0 +1,148 @@
+var data = [
+  {id: 1, author: "Pete Hunt", text: "This is one comment"},
+  {id: 2, author: "Jordan Walke", text: "This is *another* comment"}
+]
+
+// react tutorial
+var CommentBox = React.createClass({
+	loadCommentsFromSever: function() {
+        $.ajax({
+            url: this.props.url,
+            dataType: 'json',
+            cache: false,
+            success: function(data) {
+                this.setState({data: data})
+            }.bind(this),
+            error: function(xhr, status, err) {
+                console.error(this.props.url, status, err.toString())
+            }.bind(this)
+        })
+    },
+
+    handleCommentSubmit: function(comment) {
+        var comments = this.state.data
+
+        // optimistic
+        comment.id = Date.now()
+        var newComments = comments.concat([comment])
+        this.setState({data: newComments})
+
+        $.ajax({
+            url: this.props.url,
+            dataType: 'json',
+            type: 'POST',
+            data: comment,
+            success: function(data) {
+                this.setState({data: data})
+            }.bind(this),
+            error: function(xhr, status, err) {
+                this.setState({data: comments})
+                console.error(this.props.url, status, err.toString())
+            }.bind(this)
+        })
+    },
+
+    getInitialState: function() {
+        return {data:[]}
+    },
+
+    componentDidMount: function() {
+        this.loadCommentsFromSever()
+        setInterval(this.loadCommentsFromSever, this.props.pollInterval);
+    },
+
+    render: function() {
+		return (
+            <div className="commentBox">
+                <h1>Comments</h1>
+                <CommentList data={this.state.data} />
+                <CommentForm onCommentSubmit={this.handleCommentSubmit} />
+            </div>
+		)
+	}
+})
+
+var CommentList = React.createClass({
+    render: function() {
+        var commentNodes = this.props.data.map(function(comment) {
+            return (
+                <Comment author={comment.author} key={comment.id}>
+                    {comment.text}
+                </Comment>
+            )
+        })
+        return (
+            <div className="commentList">
+                {commentNodes}
+            </div>
+        )
+    }
+})
+
+var CommentForm = React.createClass({
+    getInitialState: function() {
+        return {author: '', text: ''}
+    },
+
+    handleAuthorChange: function(e) {
+        this.setState({author: e.target.value})
+    },
+
+    handleTextChange: function(e) {
+        this.setState({text: e.target.value})
+    },
+
+    handleSubmit: function(e) {
+        e.preventDefault()
+        var author = this.state.author.trim()
+        var text = this.state.text.trim()
+        if (!text || !author) {
+            return
+        }
+        this.props.onCommentSubmit({author: author, text: text})
+        this.setState({author: '', text: ''})
+    },
+
+    render: function() {
+        return (
+            <form className="commentForm" onSubmit={this.handleSubmit}>
+                <input 
+                    type="text" 
+                    placeholder="Your name" 
+                    value={this.state.author}
+                    onChange={this.handleAuthorChange}
+                />
+                <input 
+                    type="text" 
+                    placeholder="Say something..." 
+                    value={this.state.text}
+                    onChange={this.handleTextChange}
+                />
+                <input type="submit" value="Post" />
+            </form>
+        )
+    }
+})
+
+var Comment = React.createClass({
+    rawMarkup: function() {
+        var rawMarkup = marked(this.props.children.toString(), {sanitize: true})
+        return { __html: rawMarkup }
+    },
+
+    render: function() {
+        return (
+            <div className="comment">
+                <h2 className="commentAuthor">
+                    {this.props.author}
+                </h2>
+                <span dangerouslySetInnerHTML={this.rawMarkup()} />
+            </div>  
+        )
+    }
+})
+
+ReactDOM.render(
+	<CommentBox url="/api/comments" pollInterval={2000} />,
+	document.getElementById('content')
+)
\ No newline at end of file
