diff --git a/configuration.yaml b/configuration.yaml
index 9130fb4..2c15688 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -50,6 +50,8 @@ notify: !include notify.yaml
 
 sensor: !include_dir_merge_list sensors
 
+fan: !include fan.yaml
+
 media_player:
   - platform: samsungtv
     name: Adams TV
diff --git a/fan.yaml b/fan.yaml
new file mode 100644
index 0000000..152ce14
--- /dev/null
+++ b/fan.yaml
@@ -0,0 +1,10 @@
+- platform: mqtt
+  name: "Bedroom Fan"
+  command_topic: "bed/fan1/command"
+  state_topic: "bed/fan1/state"
+  speed_command_topic: "bed/fan1/state"
+  speed_state_topic: "bed/fan1/state"
+  retain: true
+  speeds:
+    - low
+    - high
diff --git a/groups/default_view.yaml b/groups/default_view.yaml
index 81f09ba..10023ab 100644
--- a/groups/default_view.yaml
+++ b/groups/default_view.yaml
@@ -4,3 +4,4 @@ entities:
   - sensor.temperature_1
   - sensor.humidity_1
   - light.dev
+  - fan.bedroom_fan