diff --git a/telldus-gui/Plugins/TelldusCore/Device.js b/telldus-gui/Plugins/TelldusCore/Device.js
index 0640057e..315ffe44 100644
--- a/telldus-gui/Plugins/TelldusCore/Device.js
+++ b/telldus-gui/Plugins/TelldusCore/Device.js
@@ -1,4 +1,20 @@
 function Device(id) {
 	this.id = id;
 	this.name = com.telldus.core.getName(id);
+	this.commandStack = new Array();
+}
+
+Device.prototype.pushCommand = function(command) {
+	this.commandStack.push(command);
+	command.execute(this.id);
+}
+
+Device.prototype.popCommand = function(command) {
+
+	this.commandStack.pop();
+	if (this.commandStack.length) {
+		var command = this.commandStack[this.commandStack.length-1].execute(this.id);
+	} else {
+		com.telldus.core.turnOff(this.id);
+	}
 }