diff --git a/customize.yaml b/customize.yaml
index 979210a..ba63d15 100644
--- a/customize.yaml
+++ b/customize.yaml
@@ -73,7 +73,9 @@ sensor.jeff_phone_battery:
 sensor.jeff_velocity:
   icon: mdi:speedometer
   friendly_name: Jeff's Current Speed
-  
+input_select.jeff_status:
+  friendly_name: "Jeff's Status"
+
 device_tracker.katheriesiphone:
   #icon: mdi:human-female
   entity_picture: !secret KAT_ICON
@@ -108,10 +110,10 @@ sensor.appletv:
 sensor.xboxone:
   icon: mdi:xbox
   
-sensor.jarvis:
+sensor.tycho:
   icon: mdi:linux
   
-device_tracker.jarvis:
+device_tracker.tycho:
   hidden: true
 sensor.tightbeam:
   icon: mdi:linux
diff --git a/groups.yaml b/groups.yaml
index 491db86..ba1ce09 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -21,6 +21,7 @@ network:
   view: yes
   entities:
     - group.internet
+    - group.computers
     - group.home_automation
     - group.entertainment
     - group.servers
@@ -41,15 +42,13 @@ Family:
 Jeffrey:
     - device_tracker.owntracks_jeffreysphone
     - sensor.jeff_phone_battery
+    - input_select.jeff_status
     - sensor.jeff_velocity
-    - device_tracker.jeffreyonesipad
-    - device_tracker.jeffreysmbp
-    - device_tracker.jstonemac
+    
 
 Katherine:
     - device_tracker.katheriesiphone
-    - device_tracker.katherinesipad
-    - sensor.kat_mini
+    
 
 Thermostat:
     - thermostat.first_floor
@@ -103,8 +102,15 @@ Home Automation:
 #Cameras:
 #  - device_tracker.ipcam_00626e46eb09_1
 
+Computers:
+  - device_tracker.jeffreyonesipad
+  - device_tracker.jeffreysmbp
+  - device_tracker.jstonemac
+  - device_tracker.katherinesipad
+  - sensor.kat_mini
+
 Servers:
-  - sensor.jarvis
+  - sensor.tycho
   - sensor.tightbeam
 
 Living Room:
diff --git a/sensors/devices.yaml b/sensors/devices.yaml
index e584ab8..8a40fdd 100644
--- a/sensors/devices.yaml
+++ b/sensors/devices.yaml
@@ -10,7 +10,7 @@
 
       tycho:
         friendly_name: 'tycho'
-        value_template: "{{ 'Online' if is_state('device_tracker.tycho', 'home') else 'Offline' }}"
+        value_template: "{{ 'Online' if is_state('device_tracker.jarvis', 'home') else 'Offline' }}"
 
       tightbeam:
         friendly_name: 'tightbeam'