diff --git a/.project b/.project
new file mode 100644
index 0000000..6433d8b
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>CIP</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/CommandFusion/CIPv1.1.js b/CommandFusion/CIPv1.1.js
new file mode 100644
index 0000000..52054b4
--- /dev/null
+++ b/CommandFusion/CIPv1.1.js
@@ -0,0 +1,420 @@
+/*	
+
+CIP
+
+Version:
+	1.1 - Cleanup
+	1.0 - release
+		Supports standard XPanel features, with addition of serial transmit to control system.
+		Currently does not support Password protection, List protocol, and other custom messages such as Orientation.
+Use:
+	Please visit http://www.github.com/CommandFusion/CIP for latest versions and help.
+
+*/
+
+
+
+//userMain
+CF.userMain = function() {
+	//Setup CIP instances in our Global Token Callback function for simplicity in passing those values to each system
+	CF.getJoin(CF.GlobalTokensJoin, function(j, v, tokens) {
+		var systems = tokens["CIP_System_Names"].split(",");
+		for (var sys in systems) {
+			CF.log("Initializing " + systems[sys] + "...");
+			new CIP({
+				systemName: 		systems[sys],
+				IPID:				tokens[systems[sys] + ":IP_ID"],
+				systemFeedbackName:	tokens[systems[sys] + ":Feedback_Name"],
+				DJoin_connectedFB:	tokens[systems[sys] + ":Online_Digital_Join"],
+				DJoin_Low:			tokens[systems[sys] + ":Digital_Low"],
+				DJoin_High:			tokens[systems[sys] + ":Digital_High"],
+				AJoin_Low:			tokens[systems[sys] + ":Analog_Low"],
+				AJoin_High:			tokens[systems[sys] + ":Analog_High"],
+				SJoin_Low:			tokens[systems[sys] + ":Serial_Low"],
+				SJoin_High:			tokens[systems[sys] + ":Serial_High"]
+			});
+		}
+	});
+	delete CF.userMain;
+};
+
+
+
+
+//CIP object
+var CIP = function(params){
+
+	//Instance reference
+	var self = 					this;
+	
+	//Version of this module = versionMajor.versionMinor
+	self.version =				"1.1";
+
+	//Parameters
+	self.IPID =						params["IPID"] 							|| "03";
+	self.systemName =				params["systemName"] 					|| "Crestron";
+	self.systemFeedbackName =		params["systemFeedbackName"] 			|| "Incoming_Data";
+	self.DJoin_connectedFB =		parseInt(params["DJoin_connectedFB"]) 	|| 5000;
+	self.DJoin_Low =				parseInt(params["DJoin_Low"]) 			|| 1;
+	self.DJoin_High =				parseInt(params["DJoin_High"]) 			|| 1000;
+	self.AJoin_Low =				parseInt(params["AJoin_Low"]) 			|| 1;
+	self.AJoin_High =				parseInt(params["AJoin_High"]) 			|| 500;
+	self.SJoin_Low =				parseInt(params["SJoin_Low"]) 			|| 1;
+	self.SJoin_High =				parseInt(params["SJoin_High"]) 			|| 500;
+	
+	//Timers/debouncing
+	self.heartBeatRate =			5000;	//1000 = 1s
+	self.heartBeatTimer =			null;
+	self.HoldJoins =				[];	//Array to hold joins that are being repeated
+	self.HoldRepeatTimer =			500;	//Repeat at least every .5 seconds or control system releases digital.
+		
+	//Data receive buffer
+	self.ourData = 					"";
+	
+	//Arrays that represent our joins
+	self.DJoins =					[];
+	self.AJoins =					[];
+	self.SJoins =					[];
+	self.ClearJoins =				[];
+	
+	//Items related to pages
+	self.PageJoins =				[];
+	self.PageJoinByName =			[];
+	self.CurrentPage =				null;
+	
+	//String Join values
+	self.SJValues =					[];
+		
+	//Connection event handler
+	self.onConnectionChange = function (system, connected, remote) {
+		if (connected != false) {
+			self.sendMsg("\x01\x00\x07\x7F\x00\x00\x01\x00" + String.fromCharCode("0x" + self.IPID) + "\x40",0);	 //Send IP ID connect request
+		} else {
+			self.ConnectState(0);
+		}
+	};
+
+	//Converts a string to hex for log output
+	self.toHex = function (string) {
+		var hex = '';
+		for (var i = 0; i < string.length; i++) {
+			hex += "\\x" + string.charCodeAt(i).toString(16);
+		}
+		return hex;
+	};
+
+	//Custom log implementation:
+	self.log = function (msg) {
+		if (CF.debug) {
+			CF.log("Log: " + msg);
+		}
+	};
+
+
+	
+	//Central method to handle all connection states and their feedback
+	self.ConnectState = function (state) {
+		switch (state) {
+			case 0:
+				CF.setJoin("d" + self.DJoin_connectedFB, false);
+				self.log("Disconnected from IP ID: " + self.IPID,3,0);
+				break;
+			case 1:
+				CF.setJoin("d" + self.DJoin_connectedFB, true);
+				self.log("Connected to IP ID: " + self.IPID,0,0);
+				CF.send("\x0d\x00\x02\x00\x00"); //Send Heartbeat
+				self.sendMsg("\x05\x00\x05\x00\x00\x02\x03\00",0);
+				break;
+			case 2:
+				CF.setJoin("d" + self.DJoin_connectedFB, false);
+				self.log("IP ID Register Request, Sending: " + self.IPID,2,0);
+				self.sendMsg("\x01\x00\x07\x7F\x00\x00\x01\x00" + String.fromCharCode("0x" + self.IPID) + "\x40",0);
+				break;
+			case 3:
+				CF.setJoin("d" + self.DJoin_connectedFB, false);
+				self.log("IP ID Not Defined on Processor: " + self.IPID + ". Retrying...",3,0);	 //When program isn't fully booted on processor, it will reject
+				self.sendMsg("\x01\x00\x07\x7F\x00\x00\x01\x00" + String.fromCharCode("0x" + self.IPID) + "\x40",0);
+				break;
+		}
+	};
+
+
+	//Clear our join ranges on the UI
+	self.clearJoins = function () {
+		self.log("Clearing Joins...",1,0);
+		CF.setJoins(self.ClearJoins, false);
+		self.log("Done Clearing Joins",0,0);
+	};
+	
+	//Process gui elements to setup watch, clearing, and other functions
+	self.processGui = function (gui) {
+		
+		//Setup join arrays of pages & joins
+		for (var i=0, numPages=gui.pages.length; i < numPages; i++) {
+			var joinVal = parseInt(gui.pages[i].join.substr(1))
+			if (self.DJoin_Low <= joinVal && joinVal <= self.DJoin_High) {
+				self.PageJoins[gui.pages[i].join] = true;
+				self.PageJoinByName[gui.pages[i].name] = joinVal;
+			}
+		}
+		
+		//Setup join arrays for used joins monitoring and clearing
+		for (var i=0, numJoins=gui.allJoins.length; i < numJoins; i++) {
+		    var theJoin = gui.allJoins[i];
+		    var type = theJoin.charAt(0);
+		    var num = parseInt(theJoin.substr(1));
+		    if (type === "d" && num >= self.DJoin_Low && num <= self.DJoin_High && num != self.DJoin_connectedFB && !self.PageJoins[theJoin]) {
+		        //digital
+		        self.DJoins.push(theJoin);
+		        self.ClearJoins.push({join:theJoin, value:0});
+		    } else if (type === "a" && num >= self.AJoin_Low && num <= self.AJoin_High) {
+		        //analog
+		        self.AJoins.push(theJoin);
+		        self.ClearJoins.push({join:theJoin, value:0});
+		
+		    } else if (type === "s" && num >= self.SJoin_Low && num <= self.SJoin_High) {
+		        //serial
+		        self.SJoins.push(theJoin);
+		        self.ClearJoins.push({join:theJoin, value:""});
+		    }
+		}
+		
+		//Watch pageflips
+		CF.watch(CF.PageFlipEvent, self.pageFlipEvent, true);
+		
+		//Watch joins
+		CF.watch(CF.ObjectPressedEvent, self.DJoins, self.userDigitalPush);
+		CF.watch(CF.ObjectReleasedEvent, self.DJoins, self.userDigitalRelease);
+		CF.watch(CF.ObjectPressedEvent, self.AJoins, self.userAnalogEvent);
+		CF.watch(CF.ObjectDraggedEvent, self.AJoins, self.userAnalogEvent);
+		CF.watch(CF.ObjectReleasedEvent, self.AJoins, self.userAnalogEvent);
+		CF.watch(CF.JoinChangeEvent, self.SJoins, self.userSerialEvent);
+	};
+	
+	self.pageFlipEvent = function (from, to, orientation) {
+		self.CurrentPage = to;
+		self.setPageJoin();
+	};
+	
+	//Method to send page join feedback, clearing all other page joins
+	self.setPageJoin = function () {
+		//clear 
+		for (var i in self.PageJoinByName) {
+			var rawJoin = self.PageJoinByName[i] - 1;
+			var upperByte = String.fromCharCode(rawJoin & 0xff);
+			var lowerByte = String.fromCharCode((rawJoin >> 8) | 0x0080);
+			self.sendMsg("\x05\x00\x06\x00\x00\x03\x00"+ upperByte + lowerByte, 0);
+		}
+
+		//set join if page has join
+		if (self.PageJoinByName[self.CurrentPage] != undefined) {
+			var rawJoin = self.PageJoinByName[self.CurrentPage] - 1;
+			var upperByte = String.fromCharCode(rawJoin & 0xff);
+			var lowerByte = String.fromCharCode(rawJoin >> 8);
+			self.sendMsg("\x05\x00\x06\x00\x00\x03\x00"+ upperByte + lowerByte, 0);
+		}
+	}
+	
+	self.userDigitalPush = function (join, value, tokens) {
+		var type = join.charCodeAt(0);
+		var rawJoin = parseInt(join.substr(1)) - 1;
+		var rawValue = parseInt(value);
+		var upperByte, lowerByte;
+		
+		upperByte = String.fromCharCode(rawJoin & 0xff);
+		lowerByte = String.fromCharCode(rawJoin >> 8);
+		var msg = "\x05\x00\x06\x00\x00\x03\x27"+ upperByte + lowerByte;
+		self.sendMsg(msg,0);
+		self.HoldJoins[join] = setInterval(function(){self.sendMsg(msg,0);}, self.HoldRepeatTimer);	 //repeat the held join command
+	};
+	
+	self.userDigitalRelease = function (join, value, tokens) {
+		var type = join.charCodeAt(0);
+		var rawJoin = parseInt(join.substr(1)) - 1;
+		var upperByte, lowerByte;
+		
+		upperByte = String.fromCharCode(rawJoin & 0xff);
+		clearInterval(self.HoldJoins[join]);
+		lowerByte = String.fromCharCode((rawJoin >> 8) | 0x0080);
+		self.sendMsg("\x05\x00\x06\x00\x00\x03\x27"+ upperByte + lowerByte,0);
+		clearInterval(self.HoldJoins[join]);
+	};
+	
+	self.userAnalogEvent = function (join, value, tokens) {
+		var type = join.charCodeAt(0);
+		var rawJoin = parseInt(join.substr(1)) - 1;
+		var rawValue = parseInt(value);
+		var joinUpper, joinLower, valUpper, valLower;
+		
+		joinUpper = String.fromCharCode(rawJoin >> 8);
+		joinLower = String.fromCharCode(rawJoin & 0xff);
+		valUpper = String.fromCharCode(rawValue >> 8);
+		valLower = String.fromCharCode(rawValue & 0xff);
+		self.sendMsg("\x05\x00\x08\x00\x00\x05\x14"+ joinUpper + joinLower + valUpper + valLower,0);
+	};
+	
+	self.userSerialEvent = function (join, value, tokens) {
+		var type = join.charCodeAt(0);
+		var rawJoin = parseInt(join.substr(1)) - 1;
+		var rawValue = parseInt(value);
+		self.SJValues[join] = value;
+
+		var payload = "\x00\x00" + String.fromCharCode(value.length + 2) + "\x12" + String.fromCharCode(rawJoin) + value;
+		self.sendMsg("\x05\x00" + String.fromCharCode(payload.length) + payload,0);
+	};
+	
+	//TCP receive event handler. Will process all packets even if multiple messages received for single data event
+	self.receive = function (itemName, data) {
+		var s = self.ourData + data;
+		while (s.length >= 3) {
+			var type = s.charCodeAt(0);
+			var len = (s.charCodeAt(1) << 8) + s.charCodeAt(2);
+			if (s.length < (3 + len)) {		// sanity check: buffer doesn't contain all the data advertised in the packet
+				break;	
+			}
+			var payload = s.substr(3,len);
+			s = s.substr(3 + len);
+			self.dataChange(type, len, payload);	// process payload
+		}
+		self.ourData = s;
+	}
+	
+	// ---------------------------------------------------------
+	// DATA PROCESSING
+	// ---------------------------------------------------------
+	self.processIPIDStatus = function(len, payload) {
+		if (payload == '\xff\xff\x02') {
+			// IP ID Does not Exist
+			self.ConnectState(3);
+		} else if (len == 4) {
+			// IP ID registry Success
+			self.ConnectState(1);
+		} else {
+			//not accounted for
+			self.log(self.ourData,2,2);
+		}
+	};
+
+	self.processData = function(len, payload) {
+		var dataType = payload.charCodeAt(3);
+		if (dataType == 0x00) {
+			// digital feedback
+			var joinData = (payload.charCodeAt(4) << 8) + payload.charCodeAt(5);
+			var join = ((joinData >> 8) | ((joinData & 0x7F) << 8)) + 1;
+			if (self.DJoin_Low <= join && join <= self.DJoin_High && join != self.DJoin_connectedFB) {
+				CF.setJoin("d" + join, !(joinData & 0x0080), false);
+			} else {
+				self.log("Ignoring out of range Digital: " + join,2,0);
+			}
+		} else if (dataType == 0x01) {
+			// analog feedback
+			var join = 0, value = 0, type = payload.charCodeAt(2);
+			if (type == 4) { // Join < 256
+				join = payload.charCodeAt(4) + 1;
+				value = (payload.charCodeAt(5) << 8) + payload.charCodeAt(6);
+			} else if (type == 5) {	// Join > 255
+				join = (payload.charCodeAt(4) << 8) + payload.charCodeAt(5) + 1;
+				value = (payload.charCodeAt(6) << 8) + payload.charCodeAt(7);
+			}
+			if (self.AJoin_Low <= join && join <= self.AJoin_High) {
+				CF.setJoin("a" + join, value, false);
+			} else {
+				self.log("Ignoring out of range Analog: " + join,2,0);
+			}
+		} else if (dataType == 0x02) {
+			// serial feedback
+			var package = payload.substr(4);
+			var msg = package.split("\r");
+			var joinLength = msg[0].indexOf(",") - 1;
+			var join = parseInt(msg[0].substring(1,joinLength + 1));
+			var sJoin = "s" + join;
+			var text = "";
+
+			if (self.SJoin_Low > join || join > self.SJoin_High) {
+				self.log("Ignoring out of range Serial: " + join,2,0);
+				return;
+			}
+			if (self.SJValues[sJoin] == undefined) {self.SJValues[sJoin] = "";}
+			for (var i = 0; i < msg.length - 1; i++) {
+				text = msg[i].substr(joinLength + 2);
+				if (i == 0) {
+					if(msg[i].charAt(0) === "#") {
+						if (text.length == 0) {
+							self.SJValues[sJoin] = text;
+						} else if (text.length > 0) {
+							self.SJValues[sJoin] = self.SJValues[sJoin] + "\r" + text;
+						}
+					} else if (msg[i].charAt(0) === "@") {
+						self.SJValues[sJoin] = self.SJValues[sJoin] + text;
+					}
+				} else if (i > 0) {
+					if (text.length == 0 && !(i == (msg.length-1) && self.SJValues[sJoin].length == 0)) {
+						self.SJValues[sJoin] = self.SJValues[sJoin] + "\r";
+					} else if (text.length > 0) {
+						self.SJValues[sJoin] = self.SJValues[sJoin] + text;
+					}
+				}
+			}
+
+			CF.setJoin(sJoin,self.SJValues[sJoin]);
+
+		} else if (dataType == 0x03) {
+			self.clearJoins();
+			//update request confirmation, we receive this just before processor sends the UR data.
+		} else if (dataType == 0x08) {	//Date & Time - Only sent during update request, so driving a join would require a clock.  Just for reference, for now.
+			var hour = payload.charCodeAt(5).toString(16);
+			var minute = payload.charCodeAt(6).toString(16);
+			var second = payload.charCodeAt(7).toString(16);
+			var month = payload.charCodeAt(8).toString(16);
+			var day = payload.charCodeAt(9).toString(16);
+			var year = payload.charCodeAt(10).toString(16);
+			self.log("Remote System Time: " + hour + ":" + minute + ":" + second + " " + month + "-" + day + "-" + year,0,0);
+		} else {
+			//not accounted for...
+			self.log(payload,2,2);
+		}
+	};
+
+	//parse a single incoming message from remote system
+	self.dataChange = function (type, len, payload) {	
+		if (type == 0x02) {
+			// IP ID status
+			self.processIPIDStatus(len, payload);
+		} else if (type == 0x03) {
+			//Program stopping/disconnecting.  Noting for future use.
+		} else if (type == 0x05) {
+			// data
+			self.processData(len, payload);
+		} else if (type == 0x0D || type == 0x0E) {
+			// 0x0D heartbeat timeout - Processor sends an initiator heartbeat if it doesn't receive one and times out
+			// 0x0E heartbeat response - Response to our initiator heartbeat.
+			self.heartBeatTimer = setTimeout(function(self){self.sendHeartBeat();}, self.heartBeatRate, this);
+		} else if (type == 0x0F) {
+			// processor response
+			if (len == 1) {
+				if (payload == '\x02') {	//IP ID warning/error.
+					self.ConnectState(2);
+				}
+			} else {
+				self.log(payload,2,2);
+			}
+		} else {
+			self.log(payload,2,2);
+		}
+	};
+	
+	//Initialization: General setup & Event monitors
+	
+	CF.watch(CF.ConnectionStatusChangeEvent, self.systemName, self.onConnectionChange, true);
+	CF.watch(CF.FeedbackMatchedEvent, self.systemName, self.systemFeedbackName, self.receive);
+	CF.getGuiDescription(self.processGui);
+	//CF.watch(CF.GUIResumedEvent, self.onGUIResumed);
+
+	self.log(	"\r\x09" + "CIP Ready for System: " + self.systemName + "\r" +
+				"\x09" + "Module Version: " + self.versionMajor + "." + self.versionMinor + "\r" +
+				"\x09" + "IP ID: " + self.IPID + "\r" +
+				"\x09" + "Online Feedback Join: " + self.DJoin_connectedFB + "\r" +
+				"\x09" + "Digital Range: " + self.DJoin_Low + "-" + self.DJoin_High + "\r" +
+				"\x09" + "Analog Range: " + self.AJoin_Low + "-" + self.AJoin_High + "\r" +
+				"\x09" + "Serial Range: " + self.SJoin_Low + "-" + self.SJoin_High ,0,0);
+};
\ No newline at end of file