diff --git a/config/packages/weather.yaml b/config/packages/weather.yaml
index c5db11d..86e9452 100755
--- a/config/packages/weather.yaml
+++ b/config/packages/weather.yaml
@@ -77,25 +77,11 @@ sensor:
   - platform: statistics
     name: Inside Humidity Stats
     entity_id: sensor.current_inside_humidity
+    state_characteristic: mean
     sampling_size: 500
 
   - platform: template
     sensors:
-      backporch_weather:
-        friendly_name: Back Porch Weather
-        value_template: "{{ states('sensor.acurite_6045m_3078_f') | round}} °F / {{ states('sensor.acurite_6045m_3078_h') }} %"
-      garage_weather:
-        friendly_name: Garage Weather
-        value_template: "{{ states('sensor.acurite_tower_10968_f') | round}} °F / {{ states('sensor.acurite_tower_10968_h') }} %"
-      crawlspace_weather:
-        friendly_name: Crawlspace Weather
-        value_template: "{{ states('sensor.acurite_609txc_73_f') | round}} °F / {{ states('sensor.acurite_609txc_73_h') }} %"
-      guestbath_weather:
-        friendly_name: Guest Bath Weather
-        value_template: "{{ states('sensor.acurite_tower_10331_f') | round}} °F / {{ states('sensor.acurite_tower_10331_h') }} %"
-      masterbath_weather:
-        friendly_name: Master Bath Weather
-        value_template: "{{ states('sensor.acurite_tower_12580_f') | round}} °F / {{ states('sensor.acurite_tower_master_bath_h') }} %"
       clothing_forecast:
         friendly_name: "Clothing Forecast"
         unit_of_measurement: ''
diff --git a/config/sensors/house.yaml b/config/sensors/house.yaml
index 13e9809..6c2bba7 100755
--- a/config/sensors/house.yaml
+++ b/config/sensors/house.yaml
@@ -68,28 +68,34 @@
 - platform: statistics
   name: Outside Temp Stats
   entity_id: sensor.acurite_6045m_3078_t
+  state_characteristic: mean
   sampling_size: 500
 - platform: statistics
   name: Garage Temp Stats
   entity_id: sensor.acurite_tower_10968_t
+  state_characteristic: mean
   sampling_size: 500
 
 - platform: statistics
   entity_id: sensor.craft_room_temperature
   name: "Craft Room Temp Sats"
+  state_characteristic: mean
 - platform: statistics
   entity_id: sensor.kitchen_temperature
-  name: "Kitchen Temp Sats"  
+  name: "Kitchen Temp Sats"
+  state_characteristic: mean  
 - platform: statistics
   entity_id: sensor.living_room_temperature
   name: "Living Room Temp Sats"
+  state_characteristic: mean
 - platform: statistics
   entity_id: sensor.master_bedroom_temperature
   name: "MAster Bedroom Temp Sats"
+  state_characteristic: mean
 - platform: statistics
   entity_id: sensor.skylar_room_temperature
   name: "Skylar Room Temp Sats"
-
+  state_characteristic: mean
 - platform: min_max
   name: Inside Temp Stats
   entity_ids:
@@ -134,22 +140,27 @@
 - platform: statistics
   name: Wind Speed Stats
   entity_id: sensor.nws_current_windspeed
+  state_characteristic: mean
   sampling_size: 500
 - platform: statistics
   name: Visibility Stats
   entity_id: sensor.nws_current_visibility
+  state_characteristic: mean
   sampling_size: 500
 - platform: statistics
   name: Temperature Stats
   entity_id: sensor.nws_current_temperature
+  state_characteristic: mean
   sampling_size: 500
 - platform: statistics
   name: Humidity Stats
   entity_id: sensor.nws_current_humidity
+  state_characteristic: mean
   sampling_size: 500
 - platform: statistics
   name: Washer Power Stats
   entity_id: sensor.washer_switch_electric_consumed_kwh
+  state_characteristic: mean
   sampling_size: 500
 - platform: history_stats
   name: Cooling Last Month
diff --git a/config/sensors/speedtest.yaml b/config/sensors/speedtest.yaml
new file mode 100755
index 0000000..4351963
--- /dev/null
+++ b/config/sensors/speedtest.yaml
@@ -0,0 +1,13 @@
+
+- platform: statistics
+  name: Internet Test Down
+  entity_id: sensor.speedtest_download
+  state_characteristic: value_max
+  max_age:
+    days: 7
+- platform: statistics
+  name: Internet Test Up
+  entity_id: sensor.speedtest_upload
+  state_characteristic: value_max
+  max_age:
+    days: 7