diff --git a/html/includes/graphs/cpmCPU.inc.php b/html/includes/graphs/cpmCPU.inc.php
new file mode 100644
index 000000000..4ffea134c
--- /dev/null
+++ b/html/includes/graphs/cpmCPU.inc.php
@@ -0,0 +1,26 @@
+<?php
+
+$scale_min = "0";
+$scale_max = "100";
+
+include("common.inc.php");
+
+  $iter = "1";
+
+  $sql = mysql_query("SELECT * FROM `cpmCPU` AS C, `devices` AS D where C.`cpmCPU_id` = '".mres($_GET['id'])."' AND C.device_id = D.device_id");
+  $rrd_options .= " COMMENT:'                                Cur    Max\\n'";
+  while($proc = mysql_fetch_array($sql)) {
+    if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
+    } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
+    } elseif($iter=="7") {$colour="FF0084"; unset($iter); }
+    $proc['descr_fixed'] = str_pad($proc['entPhysicalDescr'], 28);
+    $proc['descr_fixed'] = substr($proc['descr_fixed'],0,28);
+    $rrd  = $config['rrd_dir'] . "/".$proc['hostname']."/cpmCPU-" . $proc['cpmCPU_oid'] . ".rrd";
+    $rrd_options .= " DEF:proc" . $proc['cpmCPU_oid'] . "=$rrd:usage:AVERAGE ";
+    $rrd_options .= " LINE1:proc" . $proc['cpmCPU_oid'] . "#" . $colour . ":'" . $proc['descr_fixed'] . "' ";
+    $rrd_options .= " GPRINT:proc" . $proc['cpmCPU_oid'] . ":LAST:%3.0lf";
+    $rrd_options .= " GPRINT:proc" . $proc['cpmCPU_oid'] . ":MAX:%3.0lf\\\l ";
+    $iter++;
+  }
+
+?>
diff --git a/html/includes/graphs/customer_bits.inc.php b/html/includes/graphs/customer_bits.inc.php
new file mode 100644
index 000000000..c20d684f3
--- /dev/null
+++ b/html/includes/graphs/customer_bits.inc.php
@@ -0,0 +1,22 @@
+<?php
+
+## Generate a list of interfaces and then call the multi_bits grapher to generate from the list
+
+$query = mysql_query("SELECT * FROM `interfaces` AS I, `devices` AS D WHERE `ifAlias` LIKE 'Cust: ".mres($_GET['cust'])." %' AND D.device_id = I.device_id");
+while($int = mysql_fetch_array($query)) {
+  if(is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/" . $int['ifIndex'] . ".rrd")) {
+    $rrd_filenames[] = $config['rrd_dir'] . "/" . $int['hostname'] . "/" . $int['ifIndex'] . ".rrd";
+  }
+}
+
+$rra_in  = "INOCTETS";
+$rra_out = "OUTOCTETS"; 
+
+$colour_line_in = "006600";
+$colour_line_out = "000099";
+$colour_area_in = "CDEB8B";
+$colour_area_out = "C3D9FF";
+
+include ("generic_multi_bits.inc.php");
+
+?>
diff --git a/html/includes/graphs/device_memory_unix.inc.php b/html/includes/graphs/device_memory_unix.inc.php
new file mode 100644
index 000000000..2d3ef2c9e
--- /dev/null
+++ b/html/includes/graphs/device_memory_unix.inc.php
@@ -0,0 +1,64 @@
+<?php
+
+include("common.inc.php");
+
+$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/mem.rrd";
+
+$rrd_options .= " -b 1024";
+
+$rrd_options .= " DEF:atotalswap=$rrd_filename:totalswap:AVERAGE";
+$rrd_options .= " DEF:aavailswap=$rrd_filename:availswap:AVERAGE";
+$rrd_options .= " DEF:atotalreal=$rrd_filename:totalreal:AVERAGE";
+$rrd_options .= " DEF:aavailreal=$rrd_filename:availreal:AVERAGE";
+$rrd_options .= " DEF:atotalfree=$rrd_filename:totalfree:AVERAGE";
+$rrd_options .= " DEF:ashared=$rrd_filename:shared:AVERAGE";
+$rrd_options .= " DEF:abuffered=$rrd_filename:buffered:AVERAGE";
+$rrd_options .= " DEF:acached=$rrd_filename:cached:AVERAGE";
+$rrd_options .= " CDEF:totalswap=atotalswap,1024,*";
+$rrd_options .= " CDEF:availswap=aavailswap,1024,*";
+$rrd_options .= " CDEF:totalreal=atotalreal,1024,*";
+$rrd_options .= " CDEF:availreal=aavailreal,1024,*";
+$rrd_options .= " CDEF:totalfree=atotalfree,1024,*";
+$rrd_options .= " CDEF:shared=ashared,1024,*";
+$rrd_options .= " CDEF:buffered=abuffered,1024,*";
+$rrd_options .= " CDEF:cached=acached,1024,*";
+$rrd_options .= " CDEF:usedreal=totalreal,availreal,-";
+$rrd_options .= " CDEF:usedswap=totalswap,availswap,-";
+$rrd_options .= " CDEF:cusedswap=usedswap,-1,*";
+$rrd_options .= " CDEF:cdeftot=availreal,shared,buffered,usedreal,cached,usedswap,+,+,+,+,+";
+$rrd_options .= " COMMENT:'Bytes       Current    Average     Maximum\\n'";
+$rrd_options .= " LINE1:usedreal#d0b080:";
+$rrd_options .= " AREA:usedreal#f0e0a0:used";
+$rrd_options .= " GPRINT:usedreal:LAST:\ \ \ %7.2lf%sB";
+$rrd_options .= " GPRINT:usedreal:AVERAGE:%7.2lf%sB";
+$rrd_options .= " GPRINT:usedreal:MAX:%7.2lf%sB\\\\n";
+$rrd_options .= " STACK:availreal#e5e5e5:free";
+$rrd_options .= " GPRINT:availreal:LAST:\ \ \ %7.2lf%sB";
+$rrd_options .= " GPRINT:availreal:AVERAGE:%7.2lf%sB";
+$rrd_options .= " GPRINT:availreal:MAX:%7.2lf%sB\\\\n";
+$rrd_options .= " LINE1:usedreal#d0b080:";
+$rrd_options .= " AREA:shared#afeced::";
+$rrd_options .= " AREA:buffered#cc0000::STACK";
+$rrd_options .= " AREA:cached#ffaa66::STACK";
+$rrd_options .= " LINE1.25:shared#008fea:shared";
+$rrd_options .= " GPRINT:shared:LAST:\ %7.2lf%sB";
+$rrd_options .= " GPRINT:shared:AVERAGE:%7.2lf%sB";
+$rrd_options .= " GPRINT:shared:MAX:%7.2lf%sB\\\\n";
+$rrd_options .= " LINE1.25:buffered#ff1a00:buffers:STACK";
+$rrd_options .= " GPRINT:buffered:LAST:%7.2lf%sB";
+$rrd_options .= " GPRINT:buffered:AVERAGE:%7.2lf%sB";
+$rrd_options .= " GPRINT:buffered:MAX:%7.2lf%sB\\\\n";
+$rrd_options .= " LINE1.25:cached#ea8f00:cached:STACK";
+$rrd_options .= " GPRINT:cached:LAST:\ %7.2lf%sB";
+$rrd_options .= " GPRINT:cached:AVERAGE:%7.2lf%sB";
+$rrd_options .= " GPRINT:cached:MAX:%7.2lf%sB\\\\n";
+$rrd_options .= " LINE1:totalreal#050505:";
+$rrd_options .= " AREA:cusedswap#C3D9FF:swap";
+$rrd_options .= " LINE1.25:cusedswap#356AA0:";
+$rrd_options .= " GPRINT:usedswap:LAST:\ \ \ %7.2lf%sB";
+$rrd_options .= " GPRINT:usedswap:AVERAGE:%7.2lf%sB";
+$rrd_options .= " GPRINT:usedswap:MAX:%7.2lf%sB\\\\n";
+$rrd_options .= " LINE1:totalreal#050505:total";
+$rrd_options .= " GPRINT:totalreal:AVERAGE:\ \ %7.2lf%sB";
+
+?>
diff --git a/html/includes/graphs/device_unixfs.inc.php b/html/includes/graphs/device_unixfs.inc.php
new file mode 100644
index 000000000..93fbf9406
--- /dev/null
+++ b/html/includes/graphs/device_unixfs.inc.php
@@ -0,0 +1,28 @@
+<?php
+
+include("common.inc.php");
+
+  $iter = "1";
+  $sql = mysql_query("SELECT * FROM storage where host_id = '$device_id'");
+  $rrd_options .= " COMMENT:'                      Size      Used    %age\\l'";
+  while($fs = mysql_fetch_array($sql)) {
+    if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
+    } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
+    } elseif($iter=="7") {$colour="FF0084"; $iter = "0"; }
+
+    $descr = str_pad($fs[hrStorageDescr], 14);
+    $descr = substr($descr,0,14);
+    $text = str_replace("/", "_", $fs['hrStorageDescr']);
+    $rrd = $config['rrd_dir'] . "/$hostname/storage-$text.rrd";
+    $rrd_options .= " DEF:$fs[storage_id]=$rrd:used:AVERAGE";
+    $rrd_options .= " DEF:$fs[storage_id]s=$rrd:size:AVERAGE";
+    $rrd_options .= " DEF:$fs[storage_id]p=$rrd:perc:AVERAGE";
+    $rrd_options .= " LINE1.25:$fs[storage_id]p#" . $colour . ":'$descr'";
+    $rrd_options .= " GPRINT:$fs[storage_id]s:LAST:%6.2lf%SB";
+    $rrd_options .= " GPRINT:$fs[storage_id]:LAST:%6.2lf%SB";
+    $rrd_options .= " GPRINT:$fs[storage_id]p:LAST:%5.2lf%%\\\\l";
+    $iter++;
+  }
+
+
+?>
diff --git a/html/includes/graphs/generic_multi_seperated.inc.php b/html/includes/graphs/generic_multi_seperated.inc.php
new file mode 100644
index 000000000..7ded1e2fc
--- /dev/null
+++ b/html/includes/graphs/generic_multi_seperated.inc.php
@@ -0,0 +1,46 @@
+<?php
+
+  include("common.inc.php");
+
+  $i = 0;
+  $rrd_options .= " COMMENT:'                               In\: Current     Maximum      '";
+  if(!$nototal) {$rrd_options .= " COMMENT:'Total      '";}
+  $rrd_options .= " COMMENT:'Out\: Current     Maximum'";
+  if(!$nototal) {$rrd_options .= " COMMENT:'     Total'";}
+  $rrd_options .= " COMMENT:'\\\\n'";
+
+  foreach($rrd_list as $rrd) {
+      if(!$config['graph_colours'][$colours_in][$iter] || !$config['graph_colours'][$colours_out][$iter]) { $iter = 0; }
+
+      $colour_in=$config['graph_colours'][$colours_in][$iter];
+      $colour_out=$config['graph_colours'][$colours_out][$iter];
+
+      $rrd_options .= " DEF:".$in.$i."=".$rrd['filename'].":".$rra_in.":AVERAGE ";
+      $rrd_options .= " DEF:".$out.$i."=".$rrd['filename'].":".$rra_out.":AVERAGE ";
+      $rrd_options .= " CDEF:inB".$i."=in".$i.",$multiplier,* ";
+      $rrd_options .= " CDEF:outB".$i."=out".$i.",$multiplier,*";
+      $rrd_options .= " CDEF:outB".$i."_neg=outB".$i.",-1,*";
+      $rrd_options .= " CDEF:octets".$i."=inB".$i.",outB".$i.",+";
+      if(!$args['nototal']) {
+        $rrd_options .= " VDEF:totin".$i."=inB".$i.",TOTAL";
+        $rrd_options .= " VDEF:totout".$i."=outB".$i.",TOTAL";
+        $rrd_options .= " VDEF:tot".$i."=octets".$i.",TOTAL";
+      }
+      $rrd_options .= " HRULE:999999999999999#" . $colour_out . ":\\\s:";
+      if($i) {$stack="STACK";}
+      $rrd_options .= " AREA:inB".$i."#" . $colour_in . ":'" . substr(str_pad($rrd['descr'], 18),0,18) . "':$stack";
+      $rrd_optionsb .= " AREA:outB".$i."_neg#" . $colour_out . "::$stack";
+      $rrd_options .= " GPRINT:inB".$i.":LAST:%6.2lf%s$units";
+      $rrd_options .= " GPRINT:inB".$i.":MAX:%6.2lf%s$units";
+      if(!$nototal) { $rrd_options .= " GPRINT:totin".$i.":%6.2lf%s$total_units"; }
+      $rrd_options .= " COMMENT:'    '";
+      $rrd_options .= " GPRINT:outB".$i.":LAST:%6.2lf%s$units";
+      $rrd_options .= " GPRINT:outB".$i.":MAX:%6.2lf%s$units";
+      if(!$nototal) { $rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit"; }
+       $rrd_options .= " COMMENT:\\\\n";
+      $i++; $iter++;
+  }
+  $rrd_options .= $rrd_optionsb;
+  $rrd_options .= " HRULE:0#999999";
+
+?>
diff --git a/html/includes/graphs/generic_multi_simplex_seperated.inc.php b/html/includes/graphs/generic_multi_simplex_seperated.inc.php
new file mode 100644
index 000000000..d8d332497
--- /dev/null
+++ b/html/includes/graphs/generic_multi_simplex_seperated.inc.php
@@ -0,0 +1,32 @@
+<?php
+
+  include("common.inc.php");
+
+  $i = 0;
+  $rrd_options .= " COMMENT:'                               In\: Current     Maximum      '";
+  if(!$nototal) {$rrd_options .= " COMMENT:'Total      '";}
+  $rrd_options .= " COMMENT:'Out\: Current     Maximum'";
+  if(!$nototal) {$rrd_options .= " COMMENT:'     Total'";}
+  $rrd_options .= " COMMENT:'\\\\n'";
+
+  foreach($rrd_list as $rrd) {
+      if(!$config['graph_colours'][$colours][$iter]) { $iter = 0; }
+      $colour=$config['graph_colours'][$colours][$iter];
+      $rrd_options .= " DEF:".$rrd['rra'].$i."=".$rrd['filename'].":".$rrd['rra'].":AVERAGE ";
+      $rrd_options .= " DEF:".$rrd['rra'].$i."max=".$rrd['filename'].":".$rrd['rra'].":MAX ";
+
+      #echo("<p>DEF:".$rrd['rra'].$i."=".$rrd['filename'].":".$rrd['rra'].":AVERAGE</p>");
+
+      if(!$args['nototal']) {
+        $rrd_options .= " VDEF:tot".$rrd['rra'].$i."=".$rrd['rra'].$i.",TOTAL";
+      }
+      if($i) {$stack="STACK";}
+      $rrd_options .= " AREA:".$rrd['rra'].$i."#" . $colour . ":'" . substr(str_pad($rrd['descr'], 18),0,18) . "':$stack";
+      $rrd_options .= " GPRINT:".$rrd['rra'].$i.":LAST:%6.2lf%s$units";
+      $rrd_options .= " GPRINT:".$rrd['rra'].$i."max:MAX:%6.2lf%s$units";
+      if(!$nototal) { $rrd_options .= " GPRINT:tot".$rrd['rra'].$i.":%6.2lf%s$total_units"; }
+      $rrd_options .= " COMMENT:\\\\n";
+      $i++; $iter++;
+  }
+
+?>
diff --git a/html/includes/graphs/port_etherlike.inc.php b/html/includes/graphs/port_etherlike.inc.php
new file mode 100644
index 000000000..b4763ed83
--- /dev/null
+++ b/html/includes/graphs/port_etherlike.inc.php
@@ -0,0 +1,35 @@
+<?php
+
+## Generate a list of interfaces and then call the multi_bits grapher to generate from the list
+
+$query = mysql_query("SELECT * FROM `interfaces` AS I, `devices` AS D WHERE I.interface_id = '".mres($_GET['port'])."'
+                      AND I.device_id = D.device_id");
+$port = mysql_fetch_array($query);
+
+$oids = array('dot3StatsAlignmentErrors', 'dot3StatsFCSErrors', 'dot3StatsSingleCollisionFrames', 'dot3StatsMultipleCollisionFrames',
+              'dot3StatsSQETestErrors', 'dot3StatsDeferredTransmissions', 'dot3StatsLateCollisions', 'dot3StatsExcessiveCollisions',
+              'dot3StatsInternalMacTransmitErrors', 'dot3StatsCarrierSenseErrors', 'dot3StatsFrameTooLongs', 'dot3StatsInternalMacReceiveErrors',
+              'dot3StatsSymbolErrors');
+
+$i=0;
+if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/etherlike-" . $port['ifIndex'] . ".rrd")) {
+  foreach($oids as $oid){
+    $oid = str_replace("dot3Stats", "", $oid);
+    $oid_rra = truncate($oid, 19, '');
+    $rrd_create .= " DS:$oid:COUNTER:600:U:100000000000";
+    $rrd_list[$i]['filename'] = $config['rrd_dir'] . "/" . $port['hostname'] . "/etherlike-" . $port['ifIndex'] . ".rrd";
+    $rrd_list[$i]['descr'] = $oid;
+    $rrd_list[$i]['rra'] = $oid_rra;
+    $i++;
+  }
+}
+
+$colours = 'mixed';
+
+$nototal = 1;
+
+include ("generic_multi_simplex_seperated.inc.php");
+
+
+
+?>
diff --git a/html/includes/graphs/unixfs.inc.php b/html/includes/graphs/unixfs.inc.php
new file mode 100644
index 000000000..84e79ac56
--- /dev/null
+++ b/html/includes/graphs/unixfs.inc.php
@@ -0,0 +1,31 @@
+<?php
+
+$scale_min = "0";
+
+include("common.inc.php");
+
+$rrd_options .= " -b 1024";
+
+  $iter = "1";
+  $sql = mysql_query("SELECT * FROM storage where storage_id = '".mres($_GET['id'])."'");
+  $rrd_options .= " COMMENT:'                    Size       Used    %age\\n'";
+  while($fs = mysql_fetch_array($sql)) {
+    $hostname = gethostbyid($fs['host_id']);
+    if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
+    } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
+    } elseif($iter=="7") {$colour="FF0084"; $iter = "0"; }
+    $descr = str_pad($fs[hrStorageDescr], 12);
+    $descr = substr($descr,0,12);
+    $text = str_replace("/", "_", $fs['hrStorageDescr']);
+    $rrd = $config['rrd_dir'] . "/$hostname/storage-$text.rrd";
+    $rrd_options .= " DEF:$fs[storage_id]=$rrd:used:AVERAGE";
+    $rrd_options .= " DEF:$fs[storage_id]s=$rrd:size:AVERAGE";
+    $rrd_options .= " DEF:$fs[storage_id]p=$rrd:perc:AVERAGE";
+    $rrd_options .= " LINE1.25:$fs[storage_id]p#" . $colour . ":'$descr'";
+    $rrd_options .= " GPRINT:$fs[storage_id]s:LAST:%6.2lf%SB";
+    $rrd_options .= " GPRINT:$fs[storage_id]:LAST:%6.2lf%SB";
+    $rrd_options .= " GPRINT:$fs[storage_id]p:LAST:%5.2lf%%\\\\n";
+    $iter++;
+  }
+
+?>