diff --git a/appdaemon/dashboards/Attic.dash b/appdaemon/dashboards/Attic.dash
deleted file mode 100644
index e69de29..0000000
diff --git a/appdaemon/dashboards/Desk.dash b/appdaemon/dashboards/Desk.dash
index 5999537..fa9d8f5 100644
--- a/appdaemon/dashboards/Desk.dash
+++ b/appdaemon/dashboards/Desk.dash
@@ -3,7 +3,7 @@ title: Desk
 widget_dimensions: [120, 120]
 widget_size: [1, 1]
 widget_margins: [5, 5]
-columns: 4
+columns: 6
 rows: 4
 global_parameters:
     use_comma: 0
@@ -21,9 +21,10 @@ nav_back:
 # Layout
 layout:
   - include: header
-  - nav_main, clock, nav_back, reload
   - include: sensors_desk
-  - temp, heat_index, humidity, pressure
-  - light_value, light, spacer(2x1)
   - include: status
-  - ac_status, battery_status, battery_capacity, battery_voltage
\ No newline at end of file
+  - include: zwave
+  - nav_main, clock(3x1), nav_back, reload
+  - temp, heat_index, humidity, light, light_value, pressure
+  - ac_status, ac_current, battery_status, battery_capacity, battery_voltage, battery_current
+  - zwave_gateway_status, multi_sensor_attic, multi_sensor_attic_battery_level, multi_sensor_attic_temperature, multi_sensor_attic_humidity, spacer
diff --git a/appdaemon/dashboards/Sensors.dash b/appdaemon/dashboards/Sensors.dash
index 2930e70..4a84563 100644
--- a/appdaemon/dashboards/Sensors.dash
+++ b/appdaemon/dashboards/Sensors.dash
@@ -4,7 +4,7 @@ widget_dimensions: [120, 120]
 widget_size: [1, 1]
 widget_margins: [5, 5]
 columns: 6
-rows: 7
+rows: 8
 global_parameters:
     use_comma: 0
     precision: 2
@@ -39,8 +39,10 @@ layout:
   - label_desk(6x1)
   - include: sensors_desk
   - temp, heat_index, light_value, light, humidity, pressure
+  - include: zwave
   - label_attic(6x1)
+  - zwave_multi_sensor_attic_status, multi_sensor_attic, multi_sensor_attic_battery_level, multi_sensor_attic_temperature, multi_sensor_attic_humidity, multi_sensor_attic_light
   - label_system_status(6x1)
   - include: status
   - battery_status, battery_capacity, battery_voltage, battery_current, battery_health(2x1)
-  - ac_status, ac_current, ac_voltage, spacer(3x1)
\ No newline at end of file
+  - ac_status, ac_current, ac_voltage, spacer(2x1), zwave_gateway_status
\ No newline at end of file
diff --git a/appdaemon/dashboards/zwave.yaml b/appdaemon/dashboards/zwave.yaml
new file mode 100644
index 0000000..da1c456
--- /dev/null
+++ b/appdaemon/dashboards/zwave.yaml
@@ -0,0 +1,45 @@
+# mdi-z-wave
+
+zwave_gateway_status:
+  widget_type: sensor
+  title: "Z-Wave Gateway Status"
+  entity: zwave.aeon_labs_zw090_z_stick_gen5_us
+
+zwave_multi_sensor_attic_status:
+  widget_type: sensor
+  title: "Attic Multi Sensor Status"
+  entity: zwave.aeon_labs_zw100_multisensor_6
+
+multi_sensor_attic:
+  widget_type: binary_sensor
+  title: "Attic Multi Sensor"
+  entity: binary_sensor.aeon_labs_zw100_multisensor_6_sensor
+  icon_on: mdi-wifi
+  icon_off: mdi-wifi-off
+
+multi_sensor_attic_battery_level:
+  widget_type: gauge
+  title: "Attic Battery Level"
+  entity: sensor.zwave_multi_sensor_attic_battery_level
+  units: "%"
+  min: 0
+  max: 100
+
+multi_sensor_attic_temperature:
+  widget_type: sensor
+  title: Temperature
+  entity: sensor.aeon_labs_zw100_multisensor_6_temperature
+  units: '°F'
+
+multi_sensor_attic_humidity:
+  widget_type: gauge
+  title: "Humidity"
+  entity: sensor.aeon_labs_zw100_multisensor_6_relative_humidity
+  units: "%"
+  min: 0
+  max: 100
+
+multi_sensor_attic_light:
+  widget_type: sensor
+  entity: sensor.aeon_labs_zw100_multisensor_6_luminance
+  units: "Lux"
diff --git a/sensors/zwave.yaml b/sensors/zwave.yaml
new file mode 100644
index 0000000..14a295d
--- /dev/null
+++ b/sensors/zwave.yaml
@@ -0,0 +1,27 @@
+- platform: template
+  sensors:
+    zwave_multi_sensor_attic_battery_level:
+      value_template: >-
+        {%- if states.zwave.aeon_labs_zw100_multisensor_6 -%}
+          {{ state_attr('zwave.aeon_labs_zw100_multisensor_6', 'battery_level') }}
+        {%- else -%}
+          n/a
+        {%- endif -%}
+      unit_of_measurement: '%'
+      entity_id: zwave.aeon_labs_zw100_multisensor_6
+    zwave_multi_sensor_attic_failed:
+      value_template: >-
+        {%- if states.zwave.aeon_labs_zw100_multisensor_6 -%}
+          {{ state_attr('zwave.aeon_labs_zw100_multisensor_6', 'is_failed') }}
+        {%- else -%}
+          n/a
+        {%- endif -%}
+      entity_id: zwave.aeon_labs_zw100_multisensor_6
+    zwave_multi_sensor_attic_ready:
+      value_template: >-
+        {%- if states.zwave.aeon_labs_zw100_multisensor_6 -%}
+          {{ state_attr('zwave.aeon_labs_zw100_multisensor_6', 'is_ready') }}
+        {%- else -%}
+          n/a
+        {%- endif -%}
+      entity_id: zwave.aeon_labs_zw100_multisensor_6