diff --git a/images/info.png b/images/info.png
new file mode 100644
index 0000000..4dcc170
Binary files /dev/null and b/images/info.png differ
diff --git a/index.php b/index.php
index 76cd858..5ffe4fd 100644
--- a/index.php
+++ b/index.php
@@ -56,7 +56,7 @@
 	
 	foreach($DATA as $room){
 		echo '<div class="roomContainer" data-room-id="'. $room["rid"].'">';
-			echo '<h3>'.$room["name"].'</h3>';
+			echo '<h3>'.$room["name"].' <a href="info.php?rid='.$room["rid"].'"><img src="/images/info.png"/></a></h3>';
 
 			$DEVICES = array();
 				
@@ -87,7 +87,7 @@
 						echo '<div class="'.( (isset($device['offline']) && $device['offline'] == 1) ? 'unplugged' : 'plugged' ).' device '.($device['state'] == 1 ? 'light-on' : 'light-off' ).' '.($device['prodtype'] == 'Light Fixture' ? 'light-fixture' : '' ).'" data-device-id="'.$device['did'].'">'; //power > 0 then enabled 
 							//level = brightness
 							//state = on or off
-							echo '<p>'.$device['name'].'</p>';
+							echo '<p>'.$device['name'].' <a href="info.php?did='.$device['did'].'"><img src="/images/info.png"/></a></p>';
 							echo '<button data-device-id="'.$device['did'].'" class="onOffDeviceToggleButton buttonOn">On</button> | <button data-device-id="'.$device['did'].'" class="onOffDeviceToggleButton buttonOff">Off</button>';
 							echo '<div class="clear"></div>';
 							echo '<p>Brightness:</p>';
diff --git a/info.php b/info.php
new file mode 100644
index 0000000..c27d01e
--- /dev/null
+++ b/info.php
@@ -0,0 +1,38 @@
+<?php
+/*
+ *
+ * TCP Ligthing Web UI Test Script - By Brendon Irwin
+ * 
+ */
+
+include "include.php";
+
+if( isset($_REQUEST['did']) && $_REQUEST['did'] != "" ){
+	$did = $_REQUEST['did'];
+	echo '<h2>Device Info</h2>';
+	echo '<p><b>Device ID:'.$did.'</b></p>';
+	$CMD = "cmd=DeviceGetInfo&data=<gip><version>1</version><token>".TOKEN."</token><did>".$did."</did><fields>name,power,product,class,image,control,realtype,other,status</fields></gip>";
+	
+	$result = getCurlReturn($CMD);
+	$array = xmlToArray($result);
+	if( isset( $array["image"] ) && ! is_array( $array["image"]) ){
+		echo '<p><img src="data:image/png;base64,'.$array["image"].'" /></p>';
+	}
+	
+	pa( $array );
+	
+}
+	
+if( isset($_REQUEST['rid']) && $_REQUEST['rid'] != "" ){	
+	$rid = $_REQUEST['rid'];
+	echo '<h2>Room Information</h2>';
+	echo '<p><b>Room ID:'.$rid.'</b></p>';
+	
+	$CMD = "cmd=RoomGetInfoAll&data=<gip><version>1</version><token>".TOKEN."</token><rid>".$rid."</rid><fields>name,power,product,class,image,imageurl,control,other</fields></gip>";
+	
+	$result = getCurlReturn($CMD);
+	$array = xmlToArray($result);
+	
+	pa( $array );
+}
+?>
\ No newline at end of file