diff --git a/html/includes/application/proxmox.inc.php b/html/includes/application/proxmox.inc.php
new file mode 100644
index 0000000000..dcc28d9544
--- /dev/null
+++ b/html/includes/application/proxmox.inc.php
@@ -0,0 +1,18 @@
+<?php
+
+function proxmox_cluster_vms($c) {
+    return dbFetchRows("SELECT * FROM proxmox WHERE cluster = ? ORDER BY vmid", array($c));
+}
+
+function proxmox_node_vms($n) {
+    return dbFetchRows("SELECT * FROM proxmox WHERE device_id = ? ORDER BY vmid", array($n));
+}
+
+function proxmox_vm_info($vmid, $c) {
+    $vm = dbFetchRow("SELECT pm.*, d.hostname AS host, d.device_id FROM proxmox pm, devices d WHERE pm.device_id = d.device_id AND pm.vmid = ? AND pm.cluster = ?", array($vmid, $c));
+    $appid = dbFetchRow("SELECT app_id FROM applications WHERE device_id = ? AND app_type = ?", array($vm['device_id'], 'proxmox'));
+
+    $vm['ports'] = dbFetchRows("SELECT * FROM proxmox_ports WHERE vm_id = ?", array($vm['id']));
+    $vm['app_id'] = $appid['app_id'];
+    return $vm;
+}
diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index b1c44481ba..9d9d095682 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -12,6 +12,29 @@
  * @copyright  (C) 2013 LibreNMS Group
  */
 
+function var_isset($v) {
+    global $vars;
+    return isset($vars[$v]);
+}
+
+function var_eq($v, $t) {
+    global $vars;
+    if (isset($vars[$v]) && $vars[$v] == $t) {
+        return true;
+    }
+
+    return false;
+}
+
+function var_get($v) {
+    global $vars;
+    if (isset($vars[$v])) {
+        return $vars[$v];
+    }
+
+    return false;
+}
+
 
 function data_uri($file, $mime) {
     $contents = file_get_contents($file);
diff --git a/html/pages/device/apps/proxmox.inc.php b/html/pages/device/apps/proxmox.inc.php
new file mode 100644
index 0000000000..06a5d0bc86
--- /dev/null
+++ b/html/pages/device/apps/proxmox.inc.php
@@ -0,0 +1,38 @@
+<?php
+
+include('includes/application/proxmox.inc.php');
+
+global $config;
+
+$graphs = array(
+    'proxmox_traffic'       => 'Traffic',
+);
+
+foreach (proxmox_node_vms(var_get('device')) as $nvm) {
+    $vm = proxmox_vm_info($nvm['vmid'], $nvm['cluster']);
+
+    foreach ($vm['ports'] as $port) {
+        foreach ($graphs as $key => $text) {
+	        $graph_type = 'proxmox_traffic';
+	
+	        $graph_array['height']    = '100';
+	        $graph_array['width']     = '215';
+	        $graph_array['to']        = $config['time']['now'];
+	        $graph_array['id']        = $vm['app_id'];
+	        $graph_array['device_id'] = $vm['device_id'];
+	        $graph_array['type']      = 'application_'.$key;
+	        $graph_array['port']      = $port['port'];
+	        $graph_array['vmid']      = $vm['vmid'];
+	        $graph_array['cluster']   = $vm['cluster'];
+	        $graph_array['hostname']  = $vm['description'];
+	
+	        echo '<h3>'.$text.' '.$port['port'].'@'.$vm['description'].'</h3>';
+	
+	        echo "<tr bgcolor='$row_colour'><td colspan=5>";
+
+            include 'includes/print-graphrow.inc.php';
+
+            echo '</td></tr>';
+        }
+    }
+}
diff --git a/html/pages/proxmox.inc.php b/html/pages/proxmox.inc.php
index fc04dac9f6..9593992b0e 100644
--- a/html/pages/proxmox.inc.php
+++ b/html/pages/proxmox.inc.php
@@ -1,40 +1,6 @@
 <?php
 
-function var_isset($v) {
-    global $vars;
-    return isset($vars[$v]);
-}
-
-function var_eq($v, $t) {
-    global $vars;
-    if (isset($vars[$v]) && $vars[$v] == $t) {
-        return true;
-    }
-
-    return false;
-}
-
-function var_get($v) {
-    global $vars;
-    if (isset($vars[$v])) {
-        return $vars[$v];
-    }
-
-    return false;
-}
-
-function proxmox_cluster_vms($c) {
-    return dbFetchRows("SELECT * FROM proxmox WHERE cluster = ? ORDER BY vmid", array($c));
-}
-
-function proxmox_vm_info($vmid, $c) {
-    $vm = dbFetchRow("SELECT pm.*, d.hostname AS host, d.device_id FROM proxmox pm, devices d WHERE pm.device_id = d.device_id AND pm.vmid = ? AND pm.cluster = ?", array($vmid, $c));
-    $appid = dbFetchRow("SELECT app_id FROM applications WHERE device_id = ? AND app_type = ?", array($vm['device_id'], 'proxmox'));
-
-    $vm['ports'] = dbFetchRows("SELECT * FROM proxmox_ports WHERE vm_id = ?", array($vm['id']));
-    $vm['app_id'] = $appid['app_id'];
-    return $vm;
-}
+include('includes/application/proxmox.inc.php');
 $graphs['proxmox']    = array(
     'netif'
 );
@@ -73,7 +39,7 @@ if (!var_isset('cluster')) {
 } elseif (!var_isset('vmid')) {
     echo '<ul>';
     foreach (proxmox_cluster_vms(var_get('cluster')) as $pmxvm) {
-        echo '<li>'.generate_link($pmxvm['vmid']." (".$pmxvm['description'].")", array('page' => 'proxmox', 'cluster' => $pmxc['app_instance'], 'vmid' => $pmxvm['vmid'])).'</li>';
+        echo '<li>'.generate_link($pmxvm['vmid']." (".$pmxvm['description'].")", array('page' => 'proxmox', 'cluster' => var_get('cluster'), 'vmid' => $pmxvm['vmid'])).'</li>';
     }
     echo '</ul>';
 } else {
diff --git a/html/pages/proxmox/vm.inc.php b/html/pages/proxmox/vm.inc.php
index cb43e3c9f7..2f9f147763 100644
--- a/html/pages/proxmox/vm.inc.php
+++ b/html/pages/proxmox/vm.inc.php
@@ -5,9 +5,6 @@ global $vars;
 
 $vm = proxmox_vm_info(var_get('vmid'), var_get('cluster'));
 
-print '<pre>';
-var_dump($vm);
-print '</pre>';
 $graphs = array(
     'proxmox_traffic'       => 'Traffic',
 );