diff --git a/src/app/index.coffee b/src/app/index.coffee
index b4b935bd9c..6bc7ca237c 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -240,11 +240,27 @@ ready (model) ->
     # Derby extends model.at to support creation from DOM nodes
     model.at(e.target).remove()
     
-  exports.toggleMeta = (e, el) ->
-    selector = $(el).attr('data-selector')
-    if selector.charAt(0) == '$'
-      selector = '\\' + selector
-    $('#'+selector).toggle()
+  exports.toggleEdit = (e, el) ->
+    task = model.at $(el).parents('li')[0]
+    $('#\\' + task.get('id') + '-chart').hide()
+    $('#\\' + task.get('id') + '-edit').toggle()
+
+  exports.toggleChart = (e, el) ->
+    task = model.at $(el).parents('li')[0]
+    $('#\\' + task.get('id') + '-edit').hide()
+    $('#\\' + task.get('id') + '-chart').toggle()
+    
+    matrix = [['Date', 'Score']]
+    for obj in task.get('history')
+      matrix.push [obj.date, obj.value]
+    data = google.visualization.arrayToDataTable matrix
+
+    options = {
+      title: 'History'
+    }
+
+    chart = new google.visualization.LineChart(document.getElementById( task.get('id') + '-chart' ))
+    chart.draw(data, options)
 
   exports.vote = (e, el, next) ->
     direction = $(el).attr('data-direction')
diff --git a/views/app/index.html b/views/app/index.html
index 653fc3fa93..50fdb9742b 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -107,9 +107,9 @@
       <!-- TODO make this a popover -->    
       
       <div class="hover-show">
-        <a x-bind=click:toggleMeta data-selector="{{:task.id}}-edit" class="edit-link"><i class="icon-pencil"></i></a>
+        <a x-bind=click:toggleEdit><i class="icon-pencil"></i></a>
         {#if :task.history} 
-          <a x-bind=click:toggleMeta data-selector="{{:task.id}}-chart" class="chart-link"><i class="icon-signal"></i></a>
+          <a x-bind=click:toggleChart><i class="icon-signal"></i></a>
         {/}
       </div>
       
@@ -166,12 +166,7 @@
     </form>
   </div>  
   
-  <div style="display:none;" id={{:task.id}}-chart>
-    <hr/>
-    {#each :task.history}
-      Value: {value} | Date: {date}<br/>
-    {/}
-  </div>
+  <div style="display:none;" id={{:task.id}}-chart></div>
   
 <Footer:>
   <a href="https://github.com/lefnire/habitrpg"><img style="z-index:11; position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
@@ -186,3 +181,9 @@
   <script src=/jquery.min.js></script>
   <script src=/jquery-ui.min.js></script>
   <script src=/bootstrap.min.js></script>
+  <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+  <script type="text/javascript">
+    google.load("visualization", "1", {packages:["corechart"]});
+    google.setOnLoadCallback(function(){});
+  </script>
+  
\ No newline at end of file