diff --git a/automations/jeff_home_enter.yaml b/automations/jeff_home_enter.yaml
index e62dde6..515095d 100644
--- a/automations/jeff_home_enter.yaml
+++ b/automations/jeff_home_enter.yaml
@@ -1,16 +1,11 @@
 alias: "Jeff Arrives Home"
 trigger:
-#  platform: zone
-#  event: enter
-#  zone: zone.home
-#  entity_id: device_tracker.jeffreystonesiphone
-  platform: mqtt
-  topic: anchoragehouse/jeffrey/status
-  # Optional
-  payload: 'stationary'
+  platform: zone
+  event: enter
+  zone: zone.home
+  entity_id: device_tracker.jeffreystonesiphone
 action:
   - service: notify.notify
     data:
       title: "Jarvis"
-      message: "Jeff has arrived home"
-  - service: script.jeff_is_stationary
+      message: "Jeff is arriving home"
diff --git a/automations/jeff_home_leave.yaml b/automations/jeff_home_leave.yaml
index 7b242f6..bff7baa 100644
--- a/automations/jeff_home_leave.yaml
+++ b/automations/jeff_home_leave.yaml
@@ -9,4 +9,3 @@ action:
     data:
       title: "Jarvis"
       message: "Jeff has left home"
-  - service: script.jeff_is_moving
diff --git a/automations/jeff_status_lost.yaml b/automations/jeff_status_lost.yaml
new file mode 100644
index 0000000..1d66254
--- /dev/null
+++ b/automations/jeff_status_lost.yaml
@@ -0,0 +1,7 @@
+alias: "Jeff Status Lost"
+trigger:
+  platform: mqtt
+  topic: anchoragehouse/jeffrey/status
+  payload: 'unknown'
+action:
+  service: script.jeff_unknown
diff --git a/automations/jeff_status_moving.yaml b/automations/jeff_status_moving.yaml
new file mode 100644
index 0000000..1315ff5
--- /dev/null
+++ b/automations/jeff_status_moving.yaml
@@ -0,0 +1,7 @@
+alias: "Jeff Status Moving"
+trigger:
+  platform: mqtt
+  topic: anchoragehouse/jeffrey/status
+  payload: 'moving'
+action:
+  service: script.jeff_is_moving
diff --git a/automations/jeff_status_stationary.yaml b/automations/jeff_status_stationary.yaml
new file mode 100644
index 0000000..3a1a745
--- /dev/null
+++ b/automations/jeff_status_stationary.yaml
@@ -0,0 +1,7 @@
+alias: "Jeff Status Stationary"
+trigger:
+  platform: mqtt
+  topic: anchoragehouse/jeffrey/status
+  payload: 'stationary'
+action:
+  service: script.jeff_is_stationary
diff --git a/automations/jeff_status_unknown.yaml b/automations/jeff_status_unknown.yaml
deleted file mode 100644
index 8db22c2..0000000
--- a/automations/jeff_status_unknown.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-alias: "Jeff Arrives Home"
-trigger:
-#  platform: zone
-#  event: enter
-#  zone: zone.home
-#  entity_id: device_tracker.jeffreystonesiphone
-  platform: mqtt
-  topic: anchoragehouse/jeffrey/status
-  # Optional
-  payload: 'unknown'
-action:
-  - service: notify.notify
-    data:
-      title: "Jarvis"
-      message: "Jeff has arrived home"
-  - service: script.jeff_unknown
diff --git a/automations/jeff_summit_enter.yaml b/automations/jeff_summit_enter.yaml
index 7a09ec7..2a5e616 100644
--- a/automations/jeff_summit_enter.yaml
+++ b/automations/jeff_summit_enter.yaml
@@ -8,5 +8,4 @@ action:
   - service: notify.notify
     data:
       title: "Jarvis"
-      message: "Jeff has arrived at Summit"
-  - service: script.jeff_is_stationary
+      message: "Jeff is arriving at Summit"
diff --git a/automations/jeff_summit_leave.yaml b/automations/jeff_summit_leave.yaml
index a0e79ca..77c947d 100644
--- a/automations/jeff_summit_leave.yaml
+++ b/automations/jeff_summit_leave.yaml
@@ -1,16 +1,11 @@
 alias: "Jeff Leaves Summit"
 trigger:
-#  platform: zone
-#  event: leave
-#  zone: zone.summit
-#  entity_id: device_tracker.jeffreystonesiphone
-  platform: mqtt
-  topic: anchoragehouse/jeffrey/status
-  # Optional
-  payload: 'moving'
+  platform: zone
+  event: leave
+  zone: zone.summit
+  entity_id: device_tracker.jeffreystonesiphone
 action:
   - service: notify.notify
     data:
       title: "Jarvis"
       message: "Jeff has left summit"
-  - service: script.jeff_is_moving
diff --git a/automations/kat_home_enter.yaml b/automations/kat_home_enter.yaml
index b411323..e3198a5 100644
--- a/automations/kat_home_enter.yaml
+++ b/automations/kat_home_enter.yaml
@@ -8,5 +8,4 @@ action:
   - service: notify.notify
     data:
       title: "Jarvis"
-      message: "Kat has arrived home"
-  - service: script.kat_is_stationary
+      message: "Kat is arriving home"
diff --git a/automations/kat_home_leave.yaml b/automations/kat_home_leave.yaml
index 7bbc693..0019902 100644
--- a/automations/kat_home_leave.yaml
+++ b/automations/kat_home_leave.yaml
@@ -9,4 +9,3 @@ action:
     data:
       title: "Jarvis"
       message: "Kat has left home"
-  - service: script.kat_unknown
diff --git a/scripts.yaml b/scripts.yaml
index 38610a7..08d3962 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -6,6 +6,3 @@ outside_all_off: !include scripts/outside_all_off.yaml
 jeff_is_moving: !include scripts/jeff_is_moving.yaml
 jeff_is_stationary: !include scripts/jeff_is_stationary.yaml
 jeff_unknown: !include scripts/jeff_unknown.yaml
-kat_is_moving: !include scripts/kat_is_moving.yaml
-kat_is_stationary: !include scripts/kat_is_stationary.yaml
-kat_unknown: !include scripts/kat_unknown.yaml
diff --git a/scripts/kat_is_moving.yaml b/scripts/kat_is_moving.yaml
deleted file mode 100644
index a3894ce..0000000
--- a/scripts/kat_is_moving.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-sequence:
-- event: LOGBOOK_ENTRY
-  event_data:
-    name: EVENT
-    message: "Kat is Moving"
-- service: input_select.select_option
-  data:
-    entity_id: input_select.kat_status
-    option: moving
diff --git a/scripts/kat_is_stationary.yaml b/scripts/kat_is_stationary.yaml
deleted file mode 100644
index 39e30dd..0000000
--- a/scripts/kat_is_stationary.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-sequence:
-- event: LOGBOOK_ENTRY
-  event_data:
-    name: EVENT
-    message: "Kat is Stationary"
-- service: input_select.select_option
-  data:
-    entity_id: input_select.kat_status
-    option: stationary
diff --git a/scripts/kat_unknown.yaml b/scripts/kat_unknown.yaml
deleted file mode 100644
index 4fd7ef5..0000000
--- a/scripts/kat_unknown.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-sequence:
-- event: LOGBOOK_ENTRY
-  event_data:
-    name: EVENT
-    message: "Kat Status Unknown"
-- service: input_select.select_option
-  data:
-    entity_id: input_select.kat_status
-    option: unknown