diff --git a/addhost.php b/addhost.php
index 1b0127882..a9e827ec5 100755
--- a/addhost.php
+++ b/addhost.php
@@ -15,9 +15,10 @@ if($argv[1] && $argv[2] && $argv[3]) {
 
   list($hostshort) 	= explode(".", $host);
   if ( isDomainResolves($argv[1])){
-    if ( isPingable($argv[1])) { 
+    if ( isPingable($argv[1])) {
       if ( mysql_result(mysql_query("SELECT COUNT(*) FROM `devices` WHERE `hostname` = '".mres($host)."'"), 0) == '0' ) {
-        $snmphost = trim(shell_exec($config['snmpget'] ." -m SNMPv2-MIB -Oqv -$snmpver -c $community $host:$port sysName.0 | sed s/\"//g"));
+        echo($config['snmpget'] ." -m SNMPv2-MIB -Oqv -$snmpver -c $community $host:$port sysName.0");
+        $snmphost = trim(str_replace("\"", "", shell_exec($config['snmpget'] ." -m SNMPv2-MIB -Oqv -$snmpver -c $community $host:$port sysName.0")));
 #	var_dump($snmphost);
         if ($snmphost == $host || $hostshort = $host) {
           $return = createHost ($host, $community, $snmpver, $port);
diff --git a/html/pages/device/collectd.inc.php b/html/pages/device/collectd.inc.php
new file mode 100644
index 000000000..7f7b703ca
--- /dev/null
+++ b/html/pages/device/collectd.inc.php
@@ -0,0 +1,7 @@
+<?
+
+include("collectd/collectd.php");
+
+
+?>
+
diff --git a/html/pages/device/graphs/os-ios.inc.php b/html/pages/device/graphs/os-ios.inc.php
new file mode 100644
index 000000000..dfd705925
--- /dev/null
+++ b/html/pages/device/graphs/os-ios.inc.php
@@ -0,0 +1,18 @@
+<?php
+
+echo("<div class=graphhead>CPU Usage</div>");
+$graph_type = "cpu";              include ("includes/print-device-graph.php");
+echo("<br />");
+echo("<div class=graphhead>Memory Usage</div>");
+$graph_type = "mem";              include ("includes/print-device-graph.php");
+echo("<br />");
+if(mysql_result(mysql_query("SELECT count(*) FROM temperature WHERE temp_host = '" . $device['device_id'] . "'"),0)) {
+  echo("<div class=graphhead>Temperatures</div>");
+  $graph_type = "dev_temp";             include ("includes/print-device-graph.php");
+  echo("<br />");
+}
+
+include("netstats.inc.php");
+include("uptime.inc.php");
+
+?>
diff --git a/html/pages/device/graphs/os-ios_xe.inc.php b/html/pages/device/graphs/os-ios_xe.inc.php
new file mode 100644
index 000000000..2354f8d7d
--- /dev/null
+++ b/html/pages/device/graphs/os-ios_xe.inc.php
@@ -0,0 +1,5 @@
+<?
+
+include("os-ios.inc.php");
+
+?>
diff --git a/html/pages/device/graphs/os-linux.inc.php b/html/pages/device/graphs/os-linux.inc.php
new file mode 100644
index 000000000..d447d8e98
--- /dev/null
+++ b/html/pages/device/graphs/os-linux.inc.php
@@ -0,0 +1,5 @@
+<?php
+
+include("os-unix.inc.php");
+
+?>
diff --git a/html/pages/device/graphs/os-unix.inc.php b/html/pages/device/graphs/os-unix.inc.php
new file mode 100644
index 000000000..2fb76b034
--- /dev/null
+++ b/html/pages/device/graphs/os-unix.inc.php
@@ -0,0 +1,5 @@
+<?php
+
+#include("group-collectd.inc.php");
+
+?>