diff --git a/config/customize/sensors.yaml b/config/customize/sensors.yaml
index 0eb27c86..9a593bf8 100755
--- a/config/customize/sensors.yaml
+++ b/config/customize/sensors.yaml
@@ -508,24 +508,6 @@ sensor.process_node:
 
 
 
-sensor.rachio:
-  friendly_name: 'Rachio Sprinklers'
-
-  hidden: False
-  homebridge_hidden: True
-  icon: mdi:spray
-
-
-
-sensor.rachio_watering_time:
-  friendly_name: 'Rachio Watering Time'
-
-  hidden: False
-  homebridge_hidden: True
-
-
-
-
 sensor.rgb_led_garage_large:
   friendly_name: 'Rgb Led Garage Large'
 
diff --git a/config/group/MQTT.yaml b/config/group/MQTT.yaml
index 54f085e7..6860e314 100755
--- a/config/group/MQTT.yaml
+++ b/config/group/MQTT.yaml
@@ -1,5 +1,4 @@
 MQTT:
   entities:
-    - sensor.rachio_watering_time
     - sensor.medicine_time
     - sensor.last_message
diff --git a/config/packages/rachio.yaml b/config/packages/rachio.yaml
index 0fb5d76e..04450cfd 100755
--- a/config/packages/rachio.yaml
+++ b/config/packages/rachio.yaml
@@ -7,16 +7,72 @@
 ##  [Rachio Sprinkler system](http://amzn.to/2eoPKBW) - Smart Sprinkler controller
 ######################################################################
 homeassistant:
-  # customize_glob:
-  #   "*.carlojuice*":
-  #     homebridge_hidden: True
-  #     hidden: False
+  customize_glob:
+    "*.rachio*":
+      homebridge_hidden: True
+      hidden: False
+
 #-------------------------------------------
 rachio:
   api_key: !secret rachio_api
 
+sensor:
+  - platform: mqtt
+    state_topic: "ifttt/rachio/watering_time"
+    name: "Rachio_watering_time"
+
 binary_sensor:
   - platform: rachio
 
 switch:
   - platform: rachio
+
+group:
+  rachio:
+    entities:
+      - sensor.rachio_watering_time
+      - binary_sensor.carlorachio_online
+      - switch.carlorachio_in_standby_mode
+      - switch.backyard_shrubs
+      - switch.front_lawn
+      - switch.left_side_house
+      - switch.front_hedges__right_side_house
+
+automation:
+  ###################################
+  ##  LOG IFTTT Stuff - Rachio
+  ###################################
+  - alias: 'Log Sprinkler Activity'
+    hide_entity: True
+    trigger:
+      - platform: event
+        event_type: rachio_water_stops
+
+    action:
+      - service: logbook.log
+        data:
+          name: "Rachio Sprinkler:"
+          message: "The Lawn was watered just now."
+
+      - service: mqtt.publish
+        data_template:
+          payload: '{{ states("sensor.date") }}'
+          topic: 'ifttt/rachio/watering_time'
+          retain: true
+
+      - service: script.tweet_engine_image
+        data_template:
+          tweet: >
+            {{ [
+            "Just finished watering the lawn with @_Rachio.",
+            "The lawn looked thirsty so I watered it.",
+            "My lawn looks great and we definately do not water it nearly as much as everyone else. (http://amzn.to/2eoPKBW)",
+            "No rain in the forecast? @_Rachio knows & chose to water the lawn.",
+            ".@CCostan does not even think about watering the lawn. Me and @_Rachio take care of that."
+            ] | random + " #SavingWater"}}
+          image: >-
+            {{ [
+            "/config/www/custom_ui/floorplan/images/branding/sprinkler.png",
+            "/config/www/custom_ui/floorplan/images/branding/sprinkler2.png",
+            "/config/www/custom_ui/floorplan/images/branding/sprinkler3.png"
+            ] | random }}
diff --git a/config/sensor/MQTT.yaml b/config/sensor/MQTT.yaml
index c25513c5..da9bdf63 100755
--- a/config/sensor/MQTT.yaml
+++ b/config/sensor/MQTT.yaml
@@ -2,10 +2,6 @@
 ## Various MQTT sensors
 ###################################################
 
-- platform: mqtt
-  state_topic: "ifttt/rachio/watering_time"
-  name: "Rachio_watering_time"
-
 - platform: mqtt
   state_topic: "dash/medicine/medicine_time"
   name: "Medicine time"