diff --git a/README.md b/README.md
index f11dd75..641e32f 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Since Siri supports devices added through HomeKit, this means that with Homebrid
  * _Siri, turn off the Speakers._ ([Sonos](http://www.sonos.com))
  * _Siri, turn on the Dehumidifier._ ([WeMo](http://www.belkin.com/us/Products/home-automation/c/wemo-home-automation/))
  * _Siri, turn on Away Mode._ ([Xfinity Home](http://www.comcast.com/home-security.html))
- * _Siri, turn on the living room lights._ ([Wink](http://www.wink.com), [SmartThings](http://www.smartthings.com), [X10](http://github.com/edc1591/rest-mochad), [Philips Hue](http://meethue.com), [LimitlessLED/MiLight/Easybulb](http://www.limitlessled.com/), [LIFx](http://www.lifx.com/))
+ * _Siri, turn on the living room lights._ ([Wink](http://www.wink.com), [SmartThings](http://www.smartthings.com), [X10](http://github.com/edc1591/rest-mochad), [Philips Hue](http://meethue.com), [Home Assistant](http://home-assistant.io) [LimitlessLED/MiLight/Easybulb](http://www.limitlessled.com/), [LIFx](http://www.lifx.com/))
  * _Siri, set the movie scene._ ([Logitech Harmony](http://myharmony.com/))
 
 If you would like to support any other devices, please write a shim and create a pull request and I'd be happy to add it to this official list.
diff --git a/accessories/FileSensor.js b/accessories/FileSensor.js
new file mode 100644
index 0000000..e377dc6
--- /dev/null
+++ b/accessories/FileSensor.js
@@ -0,0 +1,76 @@
+var Service = require("HAP-NodeJS").Service;
+var Characteristic = require("HAP-NodeJS").Characteristic;
+var chokidar = require("chokidar");
+var debug = require("debug")("FileSensorAccessory");
+var crypto = require("crypto");
+
+module.exports = {
+  accessory: FileSensorAccessory
+}
+
+function FileSensorAccessory(log, config) {
+  this.log = log;
+
+  // url info
+  this.name = config["name"];
+  this.path = config["path"];
+  this.window_seconds = config["window_seconds"] || 5;
+  this.sensor_type = config["sensor_type"] || "m";
+  this.inverse = config["inverse"] || false;
+  
+  if(config["sn"]){
+      this.sn = config["sn"];
+  } else {
+      var shasum = crypto.createHash('sha1');
+      shasum.update(this.path);
+      this.sn = shasum.digest('base64');
+      debug('Computed SN ' + this.sn);
+  }
+}
+
+FileSensorAccessory.prototype = {
+
+  getServices: function() {
+
+    // you can OPTIONALLY create an information service if you wish to override
+    // the default values for things like serial number, model, etc.
+    var informationService = new Service.AccessoryInformation();
+    
+    informationService
+      .setCharacteristic(Characteristic.Name, this.name)
+      .setCharacteristic(Characteristic.Manufacturer, "Homebridge")
+      .setCharacteristic(Characteristic.Model, "File Sensor")
+      .setCharacteristic(Characteristic.SerialNumber, this.sn);
+    
+    var service, changeAction;
+    if(this.sensor_type === "c"){
+        service = new Service.ContactSensor();
+        changeAction = function(newState){
+            service.getCharacteristic(Characteristic.ContactSensorState)
+                    .setValue(newState ? Characteristic.ContactSensorState.CONTACT_DETECTED : Characteristic.ContactSensorState.CONTACT_NOT_DETECTED);
+        };
+    } else {
+        service = new Service.MotionSensor();
+        changeAction = function(newState){
+            service.getCharacteristic(Characteristic.MotionDetected)
+                    .setValue(newState);
+        };
+    }
+    
+    var changeHandler = function(path, stats){
+        var d = new Date();
+        if(d.getTime() - stats.mtime.getTime() <= (this.window_seconds * 1000)){
+            var newState = this.inverse ? false : true;
+            changeAction(newState);
+            if(this.timer !== undefined) clearTimeout(this.timer);
+            this.timer = setTimeout(function(){changeAction(!newState);}, this.window_seconds * 1000);
+        }
+    }.bind(this);
+    
+    var watcher = chokidar.watch(this.path, {alwaysStat: true});
+    watcher.on('add', changeHandler);
+    watcher.on('change', changeHandler);
+    
+    return [informationService, service];
+  }
+};
diff --git a/accessories/Lockitron.js b/accessories/Lockitron.js
index b5fd023..04414af 100644
--- a/accessories/Lockitron.js
+++ b/accessories/Lockitron.js
@@ -1,196 +1,73 @@
-var types = require("HAP-NodeJS/accessories/types.js");
+var Service = require('HAP-NodeJS').Service;
+var Characteristic = require('HAP-NodeJS').Characteristic;
 var request = require("request");
 
+module.exports = {
+  accessory: LockitronAccessory
+}
+
 function LockitronAccessory(log, config) {
   this.log = log;
   this.name = config["name"];
-  this.lockID = config["lock_id"];
   this.accessToken = config["api_token"];
+  this.lockID = config["lock_id"];
 }
 
-LockitronAccessory.prototype = {
-  getState: function(callback) {
-    this.log("Getting current state...");
-    
-    var that = this;
-
-    var query = {
-      access_token: this.accessToken
-    };
-    
-    request.get({
-      url: "https://api.lockitron.com/v2/locks/"+this.lockID,
-      qs: query
-    }, function(err, response, body) {
-      
-      if (!err && response.statusCode == 200) {
-        var json = JSON.parse(body);
-        var state = json.state; // "lock" or "unlock"
-        var locked = state == "lock"
-        callback(locked);
-      }
-      else {
-        that.log("Error getting state (status code "+response.statusCode+"): " + err)
-        callback(undefined);
-      }
-    });
-  },
+LockitronAccessory.prototype.getState = function(callback) {
+  this.log("Getting current state...");
   
-  setState: function(state) {
-    this.log("Set state to " + state);
+  request.get({
+    url: "https://api.lockitron.com/v2/locks/"+this.lockID,
+    qs: { access_token: this.accessToken }
+  }, function(err, response, body) {
+    
+    if (!err && response.statusCode == 200) {
+      var json = JSON.parse(body);
+      var state = json.state; // "lock" or "unlock"
+      this.log("Lock state is %s", state);
+      var locked = state == "lock"
+      callback(null, locked); // success
+    }
+    else {
+      this.log("Error getting state (status code %s): %s", response.statusCode, err);
+      callback(err);
+    }
+  }.bind(this));
+}
+  
+LockitronAccessory.prototype.setState = function(state, callback) {
+  var lockitronState = (state == 1) ? "lock" : "unlock";
 
-    var lockitronState = (state == 1) ? "lock" : "unlock";
-	  var that = this;
+  this.log("Set state to %s", lockitronState);
 
-    var query = {
-      access_token: this.accessToken,
-      state: lockitronState
-    };
+  request.put({
+    url: "https://api.lockitron.com/v2/locks/"+this.lockID,
+    qs: { access_token: this.accessToken, state: lockitronState }
+  }, function(err, response, body) {
 
-    request.put({
-      url: "https://api.lockitron.com/v2/locks/"+this.lockID,
-      qs: query
-    }, function(err, response, body) {
+    if (!err && response.statusCode == 200) {
+      this.log("State change complete.");
+      callback(null); // success
+    }
+    else {
+      this.log("Error '%s' setting lock state. Response: %s", err, body);
+      callback(err || new Error("Error setting lock state."));
+    }
+  }.bind(this));
+},
 
-      if (!err && response.statusCode == 200) {
-        that.log("State change complete.");
-      }
-      else {
-        that.log("Error '"+err+"' setting lock state: " + body);
-      }
-    });
-  },
-
-  getServices: function() {
-    var that = this;
-    return [{
-      sType: types.ACCESSORY_INFORMATION_STYPE,
-      characteristics: [{
-        cType: types.NAME_CTYPE,
-        onUpdate: null,
-        perms: ["pr"],
-        format: "string",
-        initialValue: this.name,
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "Name of the accessory",
-        designedMaxLength: 255
-      },{
-        cType: types.MANUFACTURER_CTYPE,
-        onUpdate: null,
-        perms: ["pr"],
-        format: "string",
-        initialValue: "Apigee",
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "Manufacturer",
-        designedMaxLength: 255
-      },{
-        cType: types.MODEL_CTYPE,
-        onUpdate: null,
-        perms: ["pr"],
-        format: "string",
-        initialValue: "Rev-2",
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "Model",
-        designedMaxLength: 255
-      },{
-        cType: types.SERIAL_NUMBER_CTYPE,
-        onUpdate: null,
-        perms: ["pr"],
-        format: "string",
-        initialValue: "A1S2NASF88EW",
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "SN",
-        designedMaxLength: 255
-      },{
-        cType: types.IDENTIFY_CTYPE,
-        onUpdate: null,
-        perms: ["pw"],
-        format: "bool",
-        initialValue: false,
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "Identify Accessory",
-        designedMaxLength: 1
-      }]
-    },{
-      sType: types.LOCK_MECHANISM_STYPE,
-      characteristics: [{
-        cType: types.NAME_CTYPE,
-        onUpdate: null,
-        perms: ["pr"],
-        format: "string",
-        initialValue: "Lock Mechanism",
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "Name of service",
-        designedMaxLength: 255
-      },{
-        cType: types.CURRENT_LOCK_MECHANISM_STATE_CTYPE,
-        onRead: function(callback) { that.getState(callback); },
-        onUpdate: function(value) { that.log("Update current state to " + value); },
-        perms: ["pr","ev"],
-        format: "int",
-        initialValue: 0,
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "BlaBla",
-        designedMinValue: 0,
-        designedMaxValue: 3,
-        designedMinStep: 1,
-        designedMaxLength: 1
-      },{
-        cType: types.TARGET_LOCK_MECHANISM_STATE_CTYPE,
-        onUpdate: function(value) { that.setState(value); },
-        perms: ["pr","pw","ev"],
-        format: "int",
-        initialValue: 0,
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "BlaBla",
-        designedMinValue: 0,
-        designedMaxValue: 1,
-        designedMinStep: 1,
-        designedMaxLength: 1
-      }]
-    },{
-      sType: types.LOCK_MANAGEMENT_STYPE,
-      characteristics: [{
-        cType: types.NAME_CTYPE,
-        onUpdate: null,
-        perms: ["pr"],
-        format: "string",
-        initialValue: "Lock Management",
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "Name of service",
-        designedMaxLength: 255
-      },{
-        cType: types.LOCK_MANAGEMENT_CONTROL_POINT_CTYPE,
-        onUpdate: function(value) { that.log("Update control point to " + value); },
-        perms: ["pw"],
-        format: "data",
-        initialValue: 0,
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "BlaBla",
-        designedMaxLength: 255
-      },{
-        cType: types.VERSION_CTYPE,
-        onUpdate: function(value) { that.log("Update version to " + value); },
-        perms: ["pr"],
-        format: "string",
-        initialValue: "1.0",
-        supportEvents: false,
-        supportBonjour: false,
-        manfDescription: "BlaBla",
-        designedMaxLength: 255
-      }]
-    }];
-  }
-};
-
-module.exports.accessory = LockitronAccessory;
\ No newline at end of file
+LockitronAccessory.prototype.getServices = function() {
+  
+  var service = new Service.LockMechanism(this.name);
+  
+  service
+    .getCharacteristic(Characteristic.LockCurrentState)
+    .on('get', this.getState.bind(this));
+  
+  service
+    .getCharacteristic(Characteristic.LockTargetState)
+    .on('get', this.getState.bind(this))
+    .on('set', this.setState.bind(this));
+  
+  return [service];
+}
diff --git a/accessories/mpdclient.js b/accessories/mpdclient.js
new file mode 100644
index 0000000..8fee5eb
--- /dev/null
+++ b/accessories/mpdclient.js
@@ -0,0 +1,89 @@
+var Service = require("HAP-NodeJS").Service;
+var Characteristic = require("HAP-NodeJS").Characteristic;
+var request = require("request");
+var komponist = require('komponist')
+
+module.exports = {
+  accessory: MpdClient
+}
+
+function MpdClient(log, config) {
+  this.log = log;
+  this.host = config["host"] || 'localhost';
+  this.port = config["port"] || 6600;
+}
+
+MpdClient.prototype = {
+
+  setPowerState: function(powerOn, callback) {
+
+    var log = this.log;
+  
+    komponist.createConnection(this.port, this.host, function(error, client) {
+ 
+      if (error) {
+        return callback(error);
+      }
+ 
+      if (powerOn) {
+        client.play(function(error) {
+          log("start playing");
+          client.destroy();
+          callback(error);
+        });
+      } else {
+        client.stop(function(error) {  
+          log("stop playing");
+          client.destroy();
+          callback(error);
+        });
+      }
+
+    });
+  },
+
+  getPowerState: function(callback) {
+  
+    komponist.createConnection(this.port, this.host, function(error, client) {
+
+      if (error) {
+        return callback(error);
+      }
+ 
+      client.status(function(error, status) {
+
+          client.destroy();
+
+          if (status['state'] == 'play') {
+            callback(error, 1);
+          } else {
+            callback(error, 0);
+          }
+      });
+
+    });
+  },
+
+  identify: function(callback) {
+    this.log("Identify requested!");
+    callback(); // success
+  },
+  
+  getServices: function() {
+
+    var informationService = new Service.AccessoryInformation();
+    
+    informationService
+      .setCharacteristic(Characteristic.Manufacturer, "MPD")
+      .setCharacteristic(Characteristic.Model, "MPD Client")
+      .setCharacteristic(Characteristic.SerialNumber, "81536334");
+    
+    var switchService = new Service.Switch();
+    
+    switchService.getCharacteristic(Characteristic.On)
+      .on('get', this.getPowerState.bind(this))
+      .on('set', this.setPowerState.bind(this));
+    
+    return [informationService, switchService];
+  }
+};
diff --git a/config-sample.json b/config-sample.json
index afb2893..86782e6 100644
--- a/config-sample.json
+++ b/config-sample.json
@@ -89,6 +89,12 @@
             "delay": 30,
             "repeat": 3,
             "zones":["Kitchen Lamp","Bedroom Lamp","Living Room Lamp","Hallway Lamp"]
+         },
+         {
+             "platform": "HomeAssistant",
+             "name": "HomeAssistant",
+             "host": "http://192.168.1.10:8123",
+             "password": "XXXXX"
          }
     ],
 
@@ -183,6 +189,22 @@
             "description": "Control the Hyperion TV backlight server. https://github.com/tvdzwan/hyperion",
             "host": "localhost", 
             "port": "19444"
+        },
+        {
+            "accessory": "mpdclient",
+            "name" : "mpd",
+            "host" : "localhost",
+            "port" : 6600,
+            "description": "Allows some control of an MPD server"
+        },
+        {
+            "accessory": "FileSensor",
+            "name": "File Time Motion Sensor",
+            "path": "/tmp/CameraDump/",
+            "window_seconds": 5,
+            "sensor_type": "m",
+            "inverse": false
         }
+
     ]
 }
diff --git a/package.json b/package.json
index 05db017..35c8f39 100644
--- a/package.json
+++ b/package.json
@@ -13,14 +13,15 @@
   "dependencies": {
     "ad2usb": "git+https://github.com/alistairg/node-ad2usb.git#local",
     "carwingsjs": "0.0.x",
+    "chokidar": "^1.0.5",
     "color": "0.10.x",
     "eibd": "^0.3.1",
     "elkington": "kevinohara80/elkington",
-    "hap-nodejs": "git+https://github.com/KhaosT/HAP-NodeJS#6bf0f9eaaa2d87db8d1768114c61f4acbb095c41",
+    "hap-nodejs": "git+https://github.com/KhaosT/HAP-NodeJS#98ef550c8d6fd961741673d4b695a74dd0126eba",
     "harmonyhubjs-client": "^1.1.4",
     "harmonyhubjs-discover": "git+https://github.com/swissmanu/harmonyhubjs-discover.git",
     "lifx-api": "^1.0.1",
-    "lifx": "https://github.com/magicmonkey/lifxjs.git",
+    "lifx": "git+https://github.com/magicmonkey/lifxjs.git",
     "mdns": "^2.2.4",
     "node-hue-api": "^1.0.5",
     "node-icontrol": "^0.1.4",
@@ -37,6 +38,7 @@
     "wink-js": "0.0.5",
     "xml2js": "0.4.x",
     "xmldoc": "0.1.x",
+    "komponist" : "0.1.0",
     "yamaha-nodejs": "0.4.x",
     "debug": "^2.2.0"
   }
diff --git a/platforms/Domoticz.js b/platforms/Domoticz.js
index de5b466..8930011 100644
--- a/platforms/Domoticz.js
+++ b/platforms/Domoticz.js
@@ -8,6 +8,9 @@
 // - Added support for Scenes
 // - Sorting device names
 //
+// 22 July 2015 [lukeredpath]
+// - Added SSL and basic auth support
+//
 // 26 August 2015 [EddyK69]
 // - Added parameter in config.json: 'loadscenes' for enabling/disabling loading scenes
 // - Fixed issue with dimmer-range; was 0-100, should be 0-16
@@ -17,6 +20,10 @@
 // - Fixed issue that 'on-off'-type lights would not react on Siri 'Switch on/off light'; On/Off types are now handled as Lights instead of Switches
 //   (Cannot determine if 'on/off'-type device is a Light or a Switch :( )
 //
+// 14 September 2015 [lukeredpath]
+// - Fixed incorrect dimmer range for LightwaveRF lights (0-32 required, MaxDimLevel should be honored)
+//
+//
 // Domoticz JSON API required
 // https://www.domoticz.com/wiki/Domoticz_API/JSON_URL's#Lights_and_switches
 //
@@ -183,9 +190,7 @@ DomoticzAccessory.prototype = {
 				url = this.platform.urlForQuery("type=command&param=setcolbrightnessvalue&idx=" + this.idx + "&hue=" + value + "&brightness=100" + "&iswhite=false");
 			}
 			else if (c == "setLevel") {
-				//Range should be 0-16 instead of 0-100
-				//See http://www.domoticz.com/wiki/Domoticz_API/JSON_URL%27s#Set_a_dimmable_light_to_a_certain_level
-				value = Math.round((value / 100) * 16)
+                                value = this.dimmerLevelForValue(value)
 				url = this.platform.urlForQuery("type=command&param=switchlight&idx=" + this.idx + "&switchcmd=Set%20Level&level=" + value);
 			}
 			else if (value != undefined) {
@@ -208,11 +213,19 @@ DomoticzAccessory.prototype = {
 				that.log("There was a problem sending command " + c + " to" + that.name);
 				that.log(url);
 			} else {
-				that.log(that.name + " sent command " + c);
+				that.log(that.name + " sent command " + c + " (value: " + value + ")");
       		}
       	})
   	},
 
+  // translates the HomeKit dim level as a percentage to whatever scale the device requires
+  dimmerLevelForValue: function(value) {
+    if (this.MaxDimLevel == 100) {
+      return value;
+    }
+    return Math.round((value / 100.0) * this.MaxDimLevel) 
+  },
+
   informationCharacteristics: function() {
     return [
       {
@@ -362,4 +375,4 @@ DomoticzAccessory.prototype = {
 };
 
 module.exports.accessory = DomoticzAccessory;
-module.exports.platform = DomoticzPlatform;
\ No newline at end of file
+module.exports.platform = DomoticzPlatform;
diff --git a/platforms/HomeAssistant.js b/platforms/HomeAssistant.js
new file mode 100644
index 0000000..6088b94
--- /dev/null
+++ b/platforms/HomeAssistant.js
@@ -0,0 +1,471 @@
+// Home Assistant
+//
+// Current Support: lights
+//
+// This is a shim to publish lights maintained by Home Assistant.
+// Home Assistant is an open-source home automation platform.
+// URL:     http://home-assistant.io
+// GitHub:  https://github.com/balloob/home-assistant
+//
+// HA accessories supported: Lights, Switches, Media Players.
+//
+// Media Player Support
+//
+// Media players on your Home Assistant will be added to your HomeKit as a light.
+// While this seems like a hack at first, it's actually quite useful. You can
+// turn them on, off, and set their volume (as a function of brightness).
+//
+// There are some rules to know about how on/off treats your media player. If
+// your media player supports play/pause, then turning them on and off via
+// HomeKit will play and pause them. If they do not support play/pause but then
+// support on/off they will be turned on and then off.
+//
+// HomeKit does not have a characteristic of Volume or a Speaker type. So we are
+// using the light device type here. So to turn your speaker up and down, you
+// will need to use the same language you use to set the brighness of a light.
+// You can play around with language to see what fits best.
+//
+// Examples
+//
+// Dim the Kitchen Speaker to 40% - sets volume to 40%
+// Dim the the Kitchen Speaker 10% - lowers the volume by 10%
+// Set the brightness of the Kitchen Speaker to 40%
+//
+// Remember to add platform to config.json. Example:
+// "platforms": [
+//    {
+//        "platform": "HomeAssistant",
+//        "name": "HomeAssistant",
+//        "host": "http://192.168.1.50:8123",
+//        "password": "xxx"
+//    }
+// ]
+//
+// When you attempt to add a device, it will ask for a "PIN code".
+// The default code for all HomeBridge accessories is 031-45-154.
+
+var Service = require("HAP-NodeJS").Service;
+var Characteristic = require("HAP-NodeJS").Characteristic;
+var url = require('url')
+var request = require("request");
+
+var communicationError = new Error('Can not communicate with Home Assistant.')
+
+function HomeAssistantPlatform(log, config){
+
+  // auth info
+  this.host = config["host"];
+  this.password = config["password"];
+
+  this.log = log;
+}
+
+HomeAssistantPlatform.prototype = {
+  _request: function(method, path, options, callback) {
+    var self = this
+    var requestURL = this.host + '/api' + path
+    options = options || {}
+    options.query = options.query || {}
+
+    var reqOpts = {
+      url: url.parse(requestURL),
+      method: method || 'GET',
+      qs: options.query,
+      body: JSON.stringify(options.body),
+      headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+        'x-ha-access': this.password
+      }
+    }
+
+    request(reqOpts, function onResponse(error, response, body) {
+      if (error) {
+        callback(error, response)
+        return
+      }
+
+      if (response.statusCode === 401) {
+        callback(new Error('You are not authenticated'), response)
+        return
+      }
+
+      json = JSON.parse(body)
+      callback(error, response, json)
+    })
+
+  },
+  fetchState: function(entity_id, callback){
+    this._request('GET', '/states/' + entity_id, {}, function(error, response, data){
+      if (error) {
+        callback(null)
+      }else{
+        callback(data)
+      }
+    })
+  },
+  callService: function(domain, service, service_data, callback){
+    var options = {}
+    options.body = service_data
+
+    this._request('POST', '/services/' + domain + '/' + service, options, function(error, response, data){
+      if (error) {
+        callback(null)
+      }else{
+        callback(data)
+      }
+    })
+  },
+  accessories: function(callback) {
+    this.log("Fetching HomeAssistant devices.");
+
+    var that = this;
+    var foundAccessories = [];
+    var lightsRE = /^light\./i
+    var switchRE = /^switch\./i
+    var mediaPlayerRE = /^media_player\./i
+
+
+    this._request('GET', '/states', {}, function(error, response, data){
+
+      for (var i = 0; i < data.length; i++) {
+        entity = data[i]
+        var accessory = null
+
+        if (entity.entity_id.match(lightsRE)) {
+          accessory = new HomeAssistantLight(that.log, entity, that)
+        }else if (entity.entity_id.match(switchRE)){
+          accessory = new HomeAssistantSwitch(that.log, entity, that)
+        }else if (entity.entity_id.match(mediaPlayerRE) && entity.attributes && entity.attributes.supported_media_commands){
+          accessory = new HomeAssistantMediaPlayer(that.log, entity, that)
+        }
+
+        if (accessory) {
+          foundAccessories.push(accessory)
+        }
+      }
+
+      callback(foundAccessories)
+    })
+
+  }
+}
+
+function HomeAssistantLight(log, data, client) {
+  // device info
+  this.domain = "light"
+  this.data = data
+  this.entity_id = data.entity_id
+  if (data.attributes && data.attributes.friendly_name) {
+    this.name = data.attributes.friendly_name
+  }else{
+    this.name = data.entity_id.split('.').pop().replace(/_/g, ' ')
+  }
+
+  this.client = client
+  this.log = log;
+}
+
+HomeAssistantLight.prototype = {
+  getPowerState: function(callback){
+    this.log("fetching power state for: " + this.name);
+
+    this.client.fetchState(this.entity_id, function(data){
+      if (data) {
+        powerState = data.state == 'on'
+        callback(null, powerState)
+      }else{
+        callback(communicationError)
+      }
+    }.bind(this))
+  },
+  getBrightness: function(callback){
+    this.log("fetching brightness for: " + this.name);
+
+    this.client.fetchState(this.entity_id, function(data){
+      if (data && data.attributes) {
+        brightness = ((data.attributes.brightness || 0) / 255)*100
+        callback(null, brightness)
+      }else{
+        callback(communicationError)
+      }
+    }.bind(this))
+  },
+  setPowerState: function(powerOn, callback) {
+    var that = this;
+    var service_data = {}
+    service_data.entity_id = this.entity_id
+
+    if (powerOn) {
+      this.log("Setting power state on the '"+this.name+"' to on");
+
+      this.client.callService(this.domain, 'turn_on', service_data, function(data){
+        if (data) {
+          that.log("Successfully set power state on the '"+that.name+"' to on");
+          callback()
+        }else{
+          callback(communicationError)
+        }
+      }.bind(this))
+    }else{
+      this.log("Setting power state on the '"+this.name+"' to off");
+
+      this.client.callService(this.domain, 'turn_off', service_data, function(data){
+        if (data) {
+          that.log("Successfully set power state on the '"+that.name+"' to off");
+          callback()
+        }else{
+          callback(communicationError)
+        }
+      }.bind(this))
+    }
+  },
+  setBrightness: function(level, callback) {
+    var that = this;
+    var service_data = {}
+    service_data.entity_id = this.entity_id
+
+    service_data.brightness = 255*(level/100.0)
+
+    this.log("Setting brightness on the '"+this.name+"' to " + level);
+
+    this.client.callService(this.domain, 'turn_on', service_data, function(data){
+      if (data) {
+        that.log("Successfully set brightness on the '"+that.name+"' to " + level);
+        callback()
+      }else{
+        callback(communicationError)
+      }
+    }.bind(this))
+  },
+  getServices: function() {
+    var lightbulbService = new Service.Lightbulb();
+
+    lightbulbService
+      .getCharacteristic(Characteristic.On)
+      .on('get', this.getPowerState.bind(this))
+      .on('set', this.setPowerState.bind(this));
+
+    lightbulbService
+      .addCharacteristic(Characteristic.Brightness)
+      .on('get', this.getBrightness.bind(this))
+      .on('set', this.setBrightness.bind(this));
+
+    return [lightbulbService];
+  }
+
+}
+
+function HomeAssistantMediaPlayer(log, data, client) {
+  var SUPPORT_PAUSE = 1
+  var SUPPORT_SEEK = 2
+  var SUPPORT_VOLUME_SET = 4
+  var SUPPORT_VOLUME_MUTE = 8
+  var SUPPORT_PREVIOUS_TRACK = 16
+  var SUPPORT_NEXT_TRACK = 32
+  var SUPPORT_YOUTUBE = 64
+  var SUPPORT_TURN_ON = 128
+  var SUPPORT_TURN_OFF = 256
+
+  // device info
+  this.domain = "media_player"
+  this.data = data
+  this.entity_id = data.entity_id
+  this.supportsVolume = false
+  this.supportedMediaCommands = data.attributes.supported_media_commands
+
+  if (data.attributes && data.attributes.friendly_name) {
+    this.name = data.attributes.friendly_name
+  }else{
+    this.name = data.entity_id.split('.').pop().replace(/_/g, ' ')
+  }
+
+  if ((this.supportedMediaCommands | SUPPORT_PAUSE) == this.supportedMediaCommands) {
+    this.onState = "playing"
+    this.offState = "paused"
+    this.onService = "media_play"
+    this.offService = "media_pause"
+  }else if ((this.supportedMediaCommands | SUPPORT_TURN_ON) == this.supportedMediaCommands && (this.supportedMediaCommands | SUPPORT_TURN_OFF) == this.supportedMediaCommands) {
+    this.onState = "on"
+    this.offState = "off"
+    this.onService = "turn_on"
+    this.offService = "turn_off"
+  }
+
+  if ((this.supportedMediaCommands | SUPPORT_VOLUME_SET) == this.supportedMediaCommands) {
+    this.supportsVolume = true
+  }
+
+  this.client = client
+  this.log = log;
+}
+
+HomeAssistantMediaPlayer.prototype = {
+  getPowerState: function(callback){
+    this.log("fetching power state for: " + this.name);
+
+    this.client.fetchState(this.entity_id, function(data){
+      if (data) {
+        powerState = data.state == this.onState
+        callback(null, powerState)
+      }else{
+        callback(communicationError)
+      }
+    }.bind(this))
+  },
+  getVolume: function(callback){
+    this.log("fetching volume for: " + this.name);
+    that = this
+    this.client.fetchState(this.entity_id, function(data){
+      if (data && data.attributes) {
+        that.log(JSON.stringify(data.attributes))
+        level = data.attributes.volume_level ? data.attributes.volume_level*100 : 0
+        callback(null, level)
+      }else{
+        callback(communicationError)
+      }
+    }.bind(this))
+  },
+  setPowerState: function(powerOn, callback) {
+    var that = this;
+    var service_data = {}
+    service_data.entity_id = this.entity_id
+
+    if (powerOn) {
+      this.log("Setting power state on the '"+this.name+"' to on");
+
+      this.client.callService(this.domain, this.onService, service_data, function(data){
+        if (data) {
+          that.log("Successfully set power state on the '"+that.name+"' to on");
+          callback()
+        }else{
+          callback(communicationError)
+        }
+      }.bind(this))
+    }else{
+      this.log("Setting power state on the '"+this.name+"' to off");
+
+      this.client.callService(this.domain, this.offService, service_data, function(data){
+        if (data) {
+          that.log("Successfully set power state on the '"+that.name+"' to off");
+          callback()
+        }else{
+          callback(communicationError)
+        }
+      }.bind(this))
+    }
+  },
+  setVolume: function(level, callback) {
+    var that = this;
+    var service_data = {}
+    service_data.entity_id = this.entity_id
+
+    service_data.volume_level = level/100.0
+
+    this.log("Setting volume on the '"+this.name+"' to " + level);
+
+    this.client.callService(this.domain, 'volume_set', service_data, function(data){
+      if (data) {
+        that.log("Successfully set volume on the '"+that.name+"' to " + level);
+        callback()
+      }else{
+        callback(communicationError)
+      }
+    }.bind(this))
+  },
+  getServices: function() {
+    var lightbulbService = new Service.Lightbulb();
+
+    lightbulbService
+      .getCharacteristic(Characteristic.On)
+      .on('get', this.getPowerState.bind(this))
+      .on('set', this.setPowerState.bind(this));
+
+
+    if (this.supportsVolume) {
+      lightbulbService
+        .addCharacteristic(Characteristic.Brightness)
+        .on('get', this.getVolume.bind(this))
+        .on('set', this.setVolume.bind(this));
+    }
+
+    return [lightbulbService];
+  }
+
+}
+
+
+function HomeAssistantSwitch(log, data, client) {
+  // device info
+  this.domain = "switch"
+  this.data = data
+  this.entity_id = data.entity_id
+  if (data.attributes && data.attributes.friendly_name) {
+    this.name = data.attributes.friendly_name
+  }else{
+    this.name = data.entity_id.split('.').pop().replace(/_/g, ' ')
+  }
+
+  this.client = client
+  this.log = log;
+}
+
+HomeAssistantSwitch.prototype = {
+  getPowerState: function(callback){
+    this.log("fetching power state for: " + this.name);
+
+    this.client.fetchState(this.entity_id, function(data){
+      if (data) {
+        powerState = data.state == 'on'
+        callback(null, powerState)
+      }else{
+        callback(communicationError)
+      }
+    }.bind(this))
+  },
+  setPowerState: function(powerOn, callback) {
+    var that = this;
+    var service_data = {}
+    service_data.entity_id = this.entity_id
+
+    if (powerOn) {
+      this.log("Setting power state on the '"+this.name+"' to on");
+
+      this.client.callService(this.domain, 'turn_on', service_data, function(data){
+        if (data) {
+          that.log("Successfully set power state on the '"+that.name+"' to on");
+          callback()
+        }else{
+          callback(communicationError)
+        }
+      }.bind(this))
+    }else{
+      this.log("Setting power state on the '"+this.name+"' to off");
+
+      this.client.callService(this.domain, 'turn_off', service_data, function(data){
+        if (data) {
+          that.log("Successfully set power state on the '"+that.name+"' to off");
+          callback()
+        }else{
+          callback(communicationError)
+        }
+      }.bind(this))
+    }
+  },
+  getServices: function() {
+    var switchService = new Service.Switch();
+
+    switchService
+      .getCharacteristic(Characteristic.On)
+      .on('get', this.getPowerState.bind(this))
+      .on('set', this.setPowerState.bind(this));
+
+    return [switchService];
+  }
+
+}
+
+module.exports.accessory = HomeAssistantLight;
+module.exports.accessory = HomeAssistantMediaPlayer;
+module.exports.accessory = HomeAssistantSwitch;
+module.exports.platform = HomeAssistantPlatform;
diff --git a/platforms/ZWayServer.js b/platforms/ZWayServer.js
index 322b9fb..5b79c8e 100644
--- a/platforms/ZWayServer.js
+++ b/platforms/ZWayServer.js
@@ -458,7 +458,12 @@ ZWayServerAccessory.prototype = {
                 debug("Getting value for " + vdev.metrics.title + ", characteristic \"" + cx.displayName + "\"...");
                 callback(false, Characteristic.TargetHeatingCoolingState.HEAT);
             });
-            cx.writable = false;
+            // Hmm... apparently if this is not setable, we can't add a thermostat change to a scene. So, make it writable but a no-op.
+            cx.writable = true;
+            cx.on('set', function(newValue, callback){
+                debug("WARN: Set of TargetHeatingCoolingState not yet implemented, resetting to HEAT!")
+                callback(undefined, Characteristic.TargetHeatingCoolingState.HEAT);
+            }.bind(this));
             return cx;
         }