diff --git a/POCloud/HTML Templates/Fluid_Shots.html b/POCloud/HTML Templates/Fluid_Shots.html
new file mode 100644
index 0000000..dffa018
--- /dev/null
+++ b/POCloud/HTML Templates/Fluid_Shots.html	
@@ -0,0 +1,93 @@
+<div style='margin-top: 1em;' class='col-xs-12'>
+   <div class="input-daterange input-group" id="datePicker">
+       <input id="fromDate" data-daysofhistory="30" type="text" class="form-control" name="start">
+        <span class="input-group-addon">to</span>
+       <input class="form-control" id="toDate" type="text" name="end">
+        <span class='input-group-btn'>
+           <a href="" id="runPickerBtn" class="btn btn-theme">Run</a>
+        </span>
+    </div>
+</div>
+<div class='col-xs-12' style='margin-top: 2em;'>
+    <table class="table">
+        <thead>
+            <th>Shot ID</th>
+            <th>Date & Time</th>
+            <th>Intake Pressure</th>
+            <th>Fluid Gradient</th>
+            <th>Friction</th>
+            <th>Taken By</th>
+        </thead>
+
+        <tbody id="output">
+        </tbody>
+    </table>
+	<!--<%= JSON.stringify(channels['poc.events'].value) %>-->
+</div>
+
+
+
+<script>
+
+	var nodeID = <%= node.nodeId %>;
+	var nodeType = '<%= node.nodetypeName %>';
+	var channelID = <%= channels['poc.fluidshots'].channelId %>;
+    console.log({nodeID:nodeID, nodeType:nodeType, channelID: channelID})
+
+	var formatDate = function(str){
+		var c1, c2;
+		c1 = new Date(str);
+	    c2 = (c1.getTime() / 1000);
+	    c2 = Math.floor(c2);
+	    return c2.toString();
+	};
+
+    var updateTable = function(){
+        var apiData, start, end;
+		var $output = $('#output');
+		start = $('#datePicker').find('#fromDate');
+		dateString = start.val().replace(/-/g, "/");
+		start = formatDate(dateString);
+	    end = $('#datePicker').find('#toDate');
+		dateString = end.val().replace(/-/g, "/");
+		end = formatDate(dateString);
+		apiData = "&nodelist[0][nodeId]=" + nodeID.toString() + "&nodelist[0][channelId]=" + channelID.toString();
+		apiData += "&start=" + start + "&end=" + end;
+		$.ajax({
+	        url: "http://www.pocloud.io/api2/Nodechannels",
+	        data: apiData,
+	        dataType: "json",
+	        type: "GET",
+	        success: function(data) {
+                console.log(data);
+	          var notes = data.listofstreams[0];
+	          for(var i = notes.stream.length-1; i >= 0; i--) {
+	          	var note = notes.stream[i];
+	          	var timestamp = note.x;
+	          	var jsonBlock = note.y;
+	          	var n = JSON.parse(jsonBlock);
+                var row  = "<tr>";
+                row += "<td>" + n.id + "</td>";
+                row += "<td>" + n.shot_datetime + "</td>";
+                row += "<td>" + n.pump_intake_pressure + "</td>";
+                row += "<td>" + n.fluid_gradient + "</td>";
+                row += "<td>" + n.friction + "</td>";
+                row += "<td>" + n.taken_by + "</td>";
+                row += "</tr>"
+                $output.append(row)
+	          	//$output.append(JSON.stringify(jsonBlock));
+	          }
+	        }
+	    });
+    }
+
+	$(document).on('click', '#runPickerBtn', function(e){
+		e.preventDefault();
+		updateTable();
+	});
+    $(document).ready(function(){
+        updateTable();
+    })
+
+
+</script>
diff --git a/POCloud/HTML Templates/Notes.html b/POCloud/HTML Templates/Notes.html
new file mode 100644
index 0000000..5cadd2d
--- /dev/null
+++ b/POCloud/HTML Templates/Notes.html	
@@ -0,0 +1,92 @@
+<div style='margin-top: 1em;' class='col-xs-12'>
+   <div class="input-daterange input-group" id="datePicker">
+       <input id="fromDate" data-daysofhistory="30" type="text" class="form-control" name="start">
+        <span class="input-group-addon">to</span>
+       <input class="form-control" id="toDate" type="text" name="end">
+        <span class='input-group-btn'>
+           <a href="" id="runPickerBtn" class="btn btn-theme">Run</a>
+        </span>
+    </div>
+</div>
+<div class='col-xs-12' style='margin-top: 2em;'>
+    <table class="table">
+        <thead>
+            <th>Note ID</th>
+            <th>Date & Time</th>
+            <th>Author</th>
+            <th>Type</th>
+            <th>Note</th>
+            <th>Stroke</th>
+        </thead>
+
+        <tbody id="output">
+        </tbody>
+    </table>
+	<!--<%= JSON.stringify(channels['poc.events'].value) %>-->
+</div>
+
+
+
+<script>
+
+	var nodeID = <%= node.nodeId %>;
+	var nodeType = '<%= node.nodetypeName %>';
+	var channelID = <%= channels['poc.notes'].channelId %>;
+    console.log({nodeID:nodeID, nodeType:nodeType, channelID: channelID})
+
+	var formatDate = function(str){
+		var c1, c2;
+		c1 = new Date(str);
+	    c2 = (c1.getTime() / 1000);
+	    c2 = Math.floor(c2);
+	    return c2.toString();
+	};
+
+    var updateTable = function(){
+        var apiData, start, end;
+		var $output = $('#output');
+		start = $('#datePicker').find('#fromDate');
+		dateString = start.val().replace(/-/g, "/");
+		start = formatDate(dateString);
+	    end = $('#datePicker').find('#toDate');
+		dateString = end.val().replace(/-/g, "/");
+		end = formatDate(dateString);
+		apiData = "&nodelist[0][nodeId]=" + nodeID.toString() + "&nodelist[0][channelId]=" + channelID.toString();
+		apiData += "&start=" + start + "&end=" + end;
+		$.ajax({
+	        url: "http://www.pocloud.io/api2/Nodechannels",
+	        data: apiData,
+	        dataType: "json",
+	        type: "GET",
+	        success: function(data) {
+	          var notes = data.listofstreams[0];
+	          for(var i = notes.stream.length-1; i >= 0; i--) {
+	          	var note = notes.stream[i];
+	          	var timestamp = note.x;
+	          	var jsonBlock = note.y;
+	          	var n = JSON.parse(jsonBlock);
+                var row  = "<tr>";
+                row += "<td>" + n.id + "</td>";
+                row += "<td>" + n.date_time + "</td>";
+                row += "<td>" + n.author + "</td>";
+                row += "<td>" + n.ntype + "</td>";
+                row += "<td>" + n.note + "</td>";
+                row += "<td>" + n.stroke + "</td>";
+                row += "</tr>"
+                $output.append(row)
+	          	//$output.append(JSON.stringify(jsonBlock));
+	          }
+	        }
+	    });
+    }
+
+	$(document).on('click', '#runPickerBtn', function(e){
+		e.preventDefault();
+		updateTable();
+	});
+    $(document).ready(function(){
+        updateTable();
+    })
+
+
+</script>
diff --git a/POCloud/HTML Templates/Well_Tests.html b/POCloud/HTML Templates/Well_Tests.html
new file mode 100644
index 0000000..5d15d97
--- /dev/null
+++ b/POCloud/HTML Templates/Well_Tests.html	
@@ -0,0 +1,95 @@
+<div style='margin-top: 1em;' class='col-xs-12'>
+   <div class="input-daterange input-group" id="datePicker">
+       <input id="fromDate" data-daysofhistory="30" type="text" class="form-control" name="start">
+        <span class="input-group-addon">to</span>
+       <input class="form-control" id="toDate" type="text" name="end">
+        <span class='input-group-btn'>
+           <a href="" id="runPickerBtn" class="btn btn-theme">Run</a>
+        </span>
+    </div>
+</div>
+<div class='col-xs-12' style='margin-top: 2em;'>
+    <table class="table">
+        <thead>
+            <th>Test ID</th>
+            <th>Date & Time</th>
+            <th>Oil (BBL)</th>
+            <th>Water (BBL)</th>
+            <th>Gas (MMCF)</th>
+            <th>K-Factor</th>
+            <th>Hours</th>
+        </thead>
+
+        <tbody id="output">
+        </tbody>
+    </table>
+	<!--<%= JSON.stringify(channels['poc.events'].value) %>-->
+</div>
+
+
+
+<script>
+
+	var nodeID = <%= node.nodeId %>;
+	var nodeType = '<%= node.nodetypeName %>';
+	var channelID = <%= channels['poc.welltests'].channelId %>;
+    console.log({nodeID:nodeID, nodeType:nodeType, channelID: channelID})
+
+	var formatDate = function(str){
+		var c1, c2;
+		c1 = new Date(str);
+	    c2 = (c1.getTime() / 1000);
+	    c2 = Math.floor(c2);
+	    return c2.toString();
+	};
+
+    var updateTable = function(){
+        var apiData, start, end;
+		var $output = $('#output');
+		start = $('#datePicker').find('#fromDate');
+		dateString = start.val().replace(/-/g, "/");
+		start = formatDate(dateString);
+	    end = $('#datePicker').find('#toDate');
+		dateString = end.val().replace(/-/g, "/");
+		end = formatDate(dateString);
+		apiData = "&nodelist[0][nodeId]=" + nodeID.toString() + "&nodelist[0][channelId]=" + channelID.toString();
+		apiData += "&start=" + start + "&end=" + end;
+		$.ajax({
+	        url: "http://www.pocloud.io/api2/Nodechannels",
+	        data: apiData,
+	        dataType: "json",
+	        type: "GET",
+	        success: function(data) {
+                console.log(data);
+	          var notes = data.listofstreams[0];
+	          for(var i = notes.stream.length-1; i >= 0; i--) {
+	          	var note = notes.stream[i];
+	          	var timestamp = note.x;
+	          	var jsonBlock = note.y;
+	          	var n = JSON.parse(jsonBlock);
+                var row  = "<tr>";
+                row += "<td>" + n.id + "</td>";
+                row += "<td>" + n.test_date + "</td>";
+                row += "<td>" + n.test_volume_oil + "</td>";
+                row += "<td>" + n.test_volume_water + "</td>";
+                row += "<td>" + n.test_volume_gas + "</td>";
+                row += "<td>" + n.k_factor + "</td>";
+                row += "<td>" + n.test_hours + "</td>";
+                row += "</tr>"
+                $output.append(row)
+	          	//$output.append(JSON.stringify(jsonBlock));
+	          }
+	        }
+	    });
+    }
+
+	$(document).on('click', '#runPickerBtn', function(e){
+		e.preventDefault();
+		updateTable();
+	});
+    $(document).ready(function(){
+        updateTable();
+    })
+
+
+</script>
diff --git a/POCloud/HTML Templates/events.html b/POCloud/HTML Templates/events.html
index 4a6f784..161659a 100644
--- a/POCloud/HTML Templates/events.html	
+++ b/POCloud/HTML Templates/events.html	
@@ -56,13 +56,13 @@
 		apiData = "&nodelist[0][nodeId]=" + nodeID.toString() + "&nodelist[0][channelId]=" + channelID.toString();
 		apiData += "&start=" + start + "&end=" + end;
 		$.ajax({
-	        url: "http://henrypump.meshify.com/api2/Nodechannels",
+	        url: "http://www.pocloud.io/api2/Nodechannels",
 	        data: apiData,
 	        dataType: "json",
 	        type: "GET",
 	        success: function(data) {
 	          var events = data.listofstreams[0];
-	          for(var i = events.stream.length-1; i > 0; i--) {
+	          for(var i = events.stream.length-1; i >= 0; i--) {
 	          	var event = events.stream[i];
 	          	var timestamp = event.x;
 	          	var jsonBlock = event.y;