diff --git a/binary_sensors.yaml b/binary_sensors.yaml
new file mode 100644
index 0000000..d17e17a
--- /dev/null
+++ b/binary_sensors.yaml
@@ -0,0 +1,8 @@
+#################################################################
+## Binary Sensors
+#################################################################
+
+  - platform: ring
+    monitored_conditions:
+      - ding
+      - motion
diff --git a/camera.yaml b/camera.yaml
new file mode 100644
index 0000000..7c51c8a
--- /dev/null
+++ b/camera.yaml
@@ -0,0 +1,9 @@
+#################################################################
+## Camera Feeds
+#################################################################
+
+
+  - platform: uvc
+    nvr: REDACTED.101
+    key: !secret secret_uvc_key
+    password: !secret secret_uvc_password
diff --git a/configuration.yaml b/configuration.yaml
index 374e10a..03c9e8e 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -82,12 +82,6 @@ ring:
     username: !secret secret_ring_username
     password: !secret secret_ring_password
 
-binary_sensor:
-  - platform: ring
-    monitored_conditions:
-      - ding
-      - motion
-
 # Nest
 nest:
   client_id: !secret secret_nest_clientid
@@ -229,6 +223,8 @@ logbook: !include logbook.yaml
 recorder: !include recorder.yaml
 automation: !include_dir_merge_list automation
 sensor: !include sensors.yaml
+binary_sensor: !include binary_sensors.yaml
+camera: !include camera.yaml
 input_boolean: !include input_boolean.yaml
 input_select: !include input_select.yaml
 light: !include light_group.yaml
diff --git a/customize.yaml b/customize.yaml
index 3d53fe7..7c7fcc0 100644
--- a/customize.yaml
+++ b/customize.yaml
@@ -171,6 +171,8 @@
     icon: mdi:robot-vacuum
   sensor.roomba_bin:
     icon: mdi:delete
+  sensor.roomba_status:
+    icon: mdi:robot-vacuum
         ##########################################################
         ## Weather
         ##########################################################
@@ -325,7 +327,6 @@
   sensor.ups_battery_runtime_mins:
     icon: mdi:timer
 
-
         ##########################################################
         ## All Groups / Troubleshooting
         ##########################################################
diff --git a/groups.yaml b/groups.yaml
index b990bcd..0f2822a 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -23,6 +23,13 @@ sensors:
     - group.nest
     - group.vacuum
 
+camera:
+  name: Camera
+  view: yes
+  icon: mdi:video
+  entities:
+    - group.cameras
+
 weatherdashboard:
   name: Weather
   view: yes
@@ -70,7 +77,8 @@ settings:
   view: yes
   icon: mdi:settings
   entities:
-    - group.automation_override
+    - group.automation_enable
+    - group.automation_disable
 
 troubleshooting:
   name: Troubleshooting
@@ -131,6 +139,10 @@ Indoor Motion:
   - binary_sensor.home_occupancy
   - binary_sensor.master_bedroom_occupancy
 
+Cameras:
+  - camera.north__front_door
+  - camera.west__walkout
+
 Water:
   - binary_sensor.basement_water_sensor_liquid_detected
 
@@ -159,6 +171,7 @@ Remote:
 
 Vacuum:
   - vacuum.roomba
+  - sensor.roomba_status
   - sensor.roomba_battery
   - sensor.roomba_bin
 
@@ -271,5 +284,8 @@ Eth:
   - sensor.nanopoolhashrate
   - sensor.nanopoolbalance
 
-Automation Override:
+Automation Disable:
   - input_boolean.disable_water_sensors
+
+Automation Enable:
+  - input_boolean.vacation_mode
diff --git a/sensors.yaml b/sensors.yaml
index afdd050..2cf1bd6 100644
--- a/sensors.yaml
+++ b/sensors.yaml
@@ -145,6 +145,11 @@
         friendly_name: 'Roomba'
         unit_of_measurement: '%'
         device_class: battery
+  - platform: template
+    sensors:
+      roomba_status:
+        value_template: '{{ states.vacuum.roomba.attributes.status }}'
+        friendly_name: 'Roomba Status'    
   - platform: template
     sensors:
       ups_battery_runtime_mins: