diff --git a/full_utility_rates/California/Del Oro/Del_Oro_01_Arbuckle_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_01_Arbuckle_District.owrs
new file mode 100644
index 00000000..502ecbcb
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_01_Arbuckle_District.owrs	
@@ -0,0 +1,98 @@
+# New Service Advance Deposit: 224.82
+# Late Fee : 5.00
+metadata:
+  effective_date: 12/06/2016
+  utility_name: Del Oro Water Company - Arbuckle District
+  bill_frequency: monthly
+  bill_unit: ccf
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 14.99
+         3/4"   : 22.48
+         1"     : 37.47
+         1 1/2" : 74.94
+         2"     : 119.91
+         3"     : 224.83
+    flat_rate: 2.233
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 14.99
+         3/4"   : 22.48
+         1"     : 37.47
+         1 1/2" : 74.94
+         2"     : 119.91
+         3"     : 224.83
+    flat_rate: 2.233
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 14.99
+         3/4"   : 22.48
+         1"     : 37.47
+         1 1/2" : 74.94
+         2"     : 119.91
+         3"     : 224.83
+    flat_rate: 2.233
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 14.99
+         3/4"   : 22.48
+         1"     : 37.47
+         1 1/2" : 74.94
+         2"     : 119.91
+         3"     : 224.83
+    flat_rate: 2.233
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 14.99
+         3/4"   : 22.48
+         1"     : 37.47
+         1 1/2" : 74.94
+         2"     : 119.91
+         3"     : 224.83
+    flat_rate: 2.233
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INSTITUTIONAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 14.99
+         3/4"   : 22.48
+         1"     : 37.47
+         1 1/2" : 74.94
+         2"     : 119.91
+         3"     : 224.83
+    flat_rate: 2.233
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
diff --git a/full_utility_rates/California/Del Oro/Del_Oro_02_Black_Butte_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_02_Black_Butte_District.owrs
new file mode 100644
index 00000000..b327ff88
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_02_Black_Butte_District.owrs	
@@ -0,0 +1,85 @@
+# New Service Advance Deposit: 129.60
+# Late Fee : 5.00
+metadata:
+  effective_date: 10/07/2016
+  utility_name: Del Oro Water Company - Black Butte District
+  bill_frequency: monthly
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 10.80
+         3/4"   : 16.19
+         1"     : 26.99
+         1 1/2" : 53.98
+         2"     : 86.36
+    flat_rate: 0.79
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 10.80
+         3/4"   : 16.19
+         1"     : 26.99
+         1 1/2" : 53.98
+         2"     : 86.36
+    flat_rate: 0.79
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 10.80
+         3/4"   : 16.19
+         1"     : 26.99
+         1 1/2" : 53.98
+         2"     : 86.36
+    flat_rate: 0.79
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 10.80
+         3/4"   : 16.19
+         1"     : 26.99
+         1 1/2" : 53.98
+         2"     : 86.36
+    flat_rate: 0.79
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 10.80
+         3/4"   : 16.19
+         1"     : 26.99
+         1 1/2" : 53.98
+         2"     : 86.36
+    flat_rate: 0.79
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INSTITUTIONAL:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 10.80
+         3/4"   : 16.19
+         1"     : 26.99
+         1 1/2" : 53.98
+         2"     : 86.36
+    flat_rate: 0.79
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
diff --git a/full_utility_rates/California/Del Oro/Del_Oro_03_Buzz_Tail_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_03_Buzz_Tail_District.owrs
new file mode 100644
index 00000000..51ff572c
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_03_Buzz_Tail_District.owrs	
@@ -0,0 +1,145 @@
+# New Service Connection Fee: 10,000.00
+# New Service Advance Deposit: 180.00
+# Late Fee : 5.00
+metadata:
+  effective_date: 11/24/2015
+  utility_name: Del Oro Water Company - Buzztail District
+  bill_frequency: monthly
+  bill_unit: kgal
+  prop_218_link: http://www.delorowater.com/deloro/water-districts/buzztail/item/advice-letter-428.html
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 60.00
+         3/4"   : 60.00
+         1"     : 60.00
+         1 1/2" : 60.00
+         2"     : 60.00
+         3"     : 60.00
+         4"     : 60.00
+    commodity_charge: Tiered
+    tier_starts:
+      - 0
+      - 30
+      - 100
+    tier_prices:
+      - 2
+      - 3
+      - 5 
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 60.00
+         3/4"   : 60.00
+         1"     : 60.00
+         1 1/2" : 60.00
+         2"     : 60.00
+         3"     : 60.00
+         4"     : 60.00
+    commodity_charge: Tiered
+    tier_starts:
+      - 0
+      - 30
+      - 100
+    tier_prices:
+      - 2
+      - 3
+      - 5 
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 60.00
+         3/4"   : 60.00
+         1"     : 60.00
+         1 1/2" : 60.00
+         2"     : 60.00
+         3"     : 60.00
+         4"     : 60.00
+    commodity_charge: Tiered
+    tier_starts:
+      - 0
+      - 30
+      - 100
+    tier_prices:
+      - 2
+      - 3
+      - 5 
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 60.00
+         3/4"   : 60.00
+         1"     : 60.00
+         1 1/2" : 60.00
+         2"     : 60.00
+         3"     : 60.00
+         4"     : 60.00
+    commodity_charge: Tiered
+    tier_starts:
+      - 0
+      - 30
+      - 100
+    tier_prices:
+      - 2
+      - 3
+      - 5 
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INSTITUTIONAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 60.00
+         3/4"   : 60.00
+         1"     : 60.00
+         1 1/2" : 60.00
+         2"     : 60.00
+         3"     : 60.00
+         4"     : 60.00
+    commodity_charge: Tiered
+    tier_starts:
+      - 0
+      - 30
+      - 100
+    tier_prices:
+      - 2
+      - 3
+      - 5 
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 60.00
+         3/4"   : 60.00
+         1"     : 60.00
+         1 1/2" : 60.00
+         2"     : 60.00
+         3"     : 60.00
+         4"     : 60.00
+    commodity_charge: Tiered
+    tier_starts:
+      - 0
+      - 30
+    tier_prices:
+      - 2
+      - 3.187
+    utility_surcharge: 0.0144 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
diff --git a/full_utility_rates/California/Del Oro/Del_Oro_04_Pines_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_04_Pines_District.owrs
new file mode 100644
index 00000000..7cf7dcbe
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_04_Pines_District.owrs	
@@ -0,0 +1,105 @@
+# New Service Advance Deposit: 189.08
+# Late Fee : 5.00
+metadata:
+  effective_date: 09/20/2016
+  utility_name: Del Oro Water Company - Pines District
+  bill_frequency: monthly
+  bill_unit: ccf
+  prop_218_link: http://www.delorowater.com/deloro/water-districts/california-pines.html
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 47.27
+         3/4"   : 70.90
+         1"     : 118.17
+         1 1/2" : 236.35
+         2"     : 378.16
+         3"     : 709.05
+         4"     : 1181.74
+         5"     : 2,363.49
+    flat_rate: 9.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 47.27
+         3/4"   : 70.90
+         1"     : 118.17
+         1 1/2" : 236.35
+         2"     : 378.16
+         3"     : 709.05
+         4"     : 1181.74
+         5"     : 2,363.49
+    flat_rate: 9.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 47.27
+         3/4"   : 70.90
+         1"     : 118.17
+         1 1/2" : 236.35
+         2"     : 378.16
+         3"     : 709.05
+         4"     : 1181.74
+         5"     : 2,363.49
+    flat_rate: 9.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 47.27
+         3/4"   : 70.90
+         1"     : 118.17
+         1 1/2" : 236.35
+         2"     : 378.16
+         3"     : 709.05
+         4"     : 1181.74
+         5"     : 2,363.49
+    flat_rate: 9.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 47.27
+         3/4"   : 70.90
+         1"     : 118.17
+         1 1/2" : 236.35
+         2"     : 378.16
+         3"     : 709.05
+         4"     : 1181.74
+         5"     : 2,363.49
+    flat_rate: 9.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INSTITUTIONAL:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 47.27
+         3/4"   : 70.90
+         1"     : 118.17
+         1 1/2" : 236.35
+         2"     : 378.16
+         3"     : 709.05
+         4"     : 1181.74
+         5"     : 2,363.49
+    flat_rate: 9.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
diff --git a/full_utility_rates/California/Del Oro/Del_Oro_05_Country_Estates_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_05_Country_Estates_District.owrs
new file mode 100644
index 00000000..e50519e5
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_05_Country_Estates_District.owrs	
@@ -0,0 +1,79 @@
+# New Service Advance Deposit: 219.24
+# Late Fee : 5.00
+metadata:
+  effective_date: 09/20/2016
+  utility_name: Del Oro Water Company - Country Estates District
+  bill_frequency: monthly
+  bill_unit: ccf
+  prop_218_link: http://www.delorowater.com/deloro/water-districts/country-estates.html
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 18.27
+         3/4"   : 27.40
+         1"     : 45.68
+         1 1/2" : 91.33
+         2"     : 146.13
+         3"     : 273.99
+    flat_rate: 2.022
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 18.27
+         3/4"   : 27.40
+         1"     : 45.68
+         1 1/2" : 91.33
+         2"     : 146.13
+         3"     : 273.99
+    flat_rate: 2.022
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 18.27
+         3/4"   : 27.40
+         1"     : 45.68
+         1 1/2" : 91.33
+         2"     : 146.13
+         3"     : 273.99
+    flat_rate: 2.022
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 18.27
+         3/4"   : 27.40
+         1"     : 45.68
+         1 1/2" : 91.33
+         2"     : 146.13
+         3"     : 273.99
+    flat_rate: 2.022
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on: meter_size
+      values:
+         5/8"   : 18.27
+         3/4"   : 27.40
+         1"     : 45.68
+         1 1/2" : 91.33
+         2"     : 146.13
+         3"     : 273.99
+    flat_rate: 2.022
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
diff --git a/full_utility_rates/California/Del Oro/Del_Oro_06_Ferndale_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_06_Ferndale_District.owrs
new file mode 100644
index 00000000..3372b476
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_06_Ferndale_District.owrs	
@@ -0,0 +1,128 @@
+# New Service Advance Deposit: 223.00
+# Late Fee : 5.00
+metadata:
+  effective_date: 09/03/2014
+  utility_name: Del Oro Water Company - Ferndale District
+  bill_frequency: monthly
+  bill_unit: ccf
+  prop_218_link: http://www.delorowater.com/deloro/water-districts/ferndale.html
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on:
+        - meter_size
+      values:
+         5/8"   : 22.30
+         3/4"   : 33.46
+         1"     : 55.76
+         1 1/2" : 111.52
+         2"     : 178.44
+         4"     : 557.62
+         6"     : 1115.25
+         8"     : 1784.40
+    flat_rate: 4.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on:
+        - meter_size
+      values:
+         5/8"   : 22.30
+         3/4"   : 33.46
+         1"     : 55.76
+         1 1/2" : 111.52
+         2"     : 178.44
+         4"     : 557.62
+         6"     : 1115.25
+         8"     : 1784.40
+    flat_rate: 4.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on:
+        - meter_size
+      values:
+         5/8"   : 22.30
+         3/4"   : 33.46
+         1"     : 55.76
+         1 1/2" : 111.52
+         2"     : 178.44
+         4"     : 557.62
+         6"     : 1115.25
+         8"     : 1784.40
+    flat_rate: 4.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on:
+        - meter_size
+      values:
+         5/8"   : 22.30
+         3/4"   : 33.46
+         1"     : 55.76
+         1 1/2" : 111.52
+         2"     : 178.44
+         4"     : 557.62
+         6"     : 1115.25
+         8"     : 1784.40
+    flat_rate: 4.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on:
+        - meter_size
+      values:
+         5/8"   : 22.30
+         3/4"   : 33.46
+         1"     : 55.76
+         1 1/2" : 111.52
+         2"     : 178.44
+         4"     : 557.62
+         6"     : 1115.25
+         8"     : 1784.40
+    flat_rate: 4.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INSTITUTIONAL:
+    service_charge:
+      depends_on:
+        - meter_size
+      values:
+         5/8"   : 22.30
+         3/4"   : 33.46
+         1"     : 55.76
+         1 1/2" : 111.52
+         2"     : 178.44
+         4"     : 557.62
+         6"     : 1115.25
+         8"     : 1784.40
+    flat_rate: 4.81
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  FIRE_SERVICE:
+    service_charge:
+      depends_on:
+        - meter_size
+      values:
+        2": 28
+        4": 28
+        6": 40
+        8": 53
+        10": 107
+        12": 149
+    commodity_charge: 0
+    fixed_drought_surcharge: 0
+    variable_drought_surcharge: 0
+    fixed_wastewater_charge: 0
+    variable_wastewater_charge: 0
+    bill: 1.0117*(service_charge+commodity_charge)
diff --git a/full_utility_rates/California/Del Oro/Del_Oro_07_Johnson_Part_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_07_Johnson_Part_District.owrs
new file mode 100644
index 00000000..2ff20342
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_07_Johnson_Part_District.owrs	
@@ -0,0 +1,94 @@
+# New Service Facility Fee:  9173.00
+# New Service Advance Deposit: 180.00
+# Late Fee : 5.00
+metadata:
+  effective_date: 09/20/2016
+  utility_name: Del Oro Water Company - Johnson Park District
+  bill_frequency: monthly
+  bill_unit: ccf
+  prop_218_link: http://www.delorowater.com/deloro/water-districts/johnson-park.html
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 30.00
+         3/4"   : 44.99
+         1"     : 74.99
+         1 1/2" : 149.98
+         2"     : 239.98
+    flat_rate: 4.70
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 30.00
+         3/4"   : 44.99
+         1"     : 74.99
+         1 1/2" : 149.98
+         2"     : 239.98
+    flat_rate: 4.70
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 30.00
+         3/4"   : 44.99
+         1"     : 74.99
+         1 1/2" : 149.98
+         2"     : 239.98
+    flat_rate: 4.70
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 30.00
+         3/4"   : 44.99
+         1"     : 74.99
+         1 1/2" : 149.98
+         2"     : 239.98
+    flat_rate: 4.70
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 30.00
+         3/4"   : 44.99
+         1"     : 74.99
+         1 1/2" : 149.98
+         2"     : 239.98
+    flat_rate: 4.70
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INSTITUTIONAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 30.00
+         3/4"   : 44.99
+         1"     : 74.99
+         1 1/2" : 149.98
+         2"     : 239.98
+    flat_rate: 4.70
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
diff --git a/full_utility_rates/California/Del Oro/Del_Oro_08_Lime_Saddle_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_08_Lime_Saddle_District.owrs
new file mode 100644
index 00000000..33299e0d
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_08_Lime_Saddle_District.owrs	
@@ -0,0 +1,190 @@
+# New Service Facility Fee:  Varies
+# New Service Advance Deposit: 159.60
+# Late Fee : 5.00
+metadata:
+  effective_date: 06/14/2016
+  utility_name: DelOro Water Company - Lime Saddle District
+  bill_frequency: monthly
+  bill_unit: kgal
+  prop_218_link: http://www.delorowater.com/deloro/water-districts/lime-saddle.html
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 13.30
+         3/4"   : 19.95
+         1"     : 33.25
+         1 1/2" : 66.50
+         2"     : 106.40
+         3"     : 199.50
+         4"     : 332.50
+         6"     : 665.00
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 16.03
+         3/4"   : 24.03
+         1"     : 40.06
+         1 1/2" : 80.12
+         2"     : 128.19
+         3"     : 240.37
+         4"     : 400.61
+         6"     : 801.22
+    flat_rate: 3.10
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 13.30
+         3/4"   : 19.95
+         1"     : 33.25
+         1 1/2" : 66.50
+         2"     : 106.40
+         3"     : 199.50
+         4"     : 332.50
+         6"     : 665.00
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 16.03
+         3/4"   : 24.03
+         1"     : 40.06
+         1 1/2" : 80.12
+         2"     : 128.19
+         3"     : 240.37
+         4"     : 400.61
+         6"     : 801.22
+    flat_rate: 3.10
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 13.30
+         3/4"   : 19.95
+         1"     : 33.25
+         1 1/2" : 66.50
+         2"     : 106.40
+         3"     : 199.50
+         4"     : 332.50
+         6"     : 665.00
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 16.03
+         3/4"   : 24.03
+         1"     : 40.06
+         1 1/2" : 80.12
+         2"     : 128.19
+         3"     : 240.37
+         4"     : 400.61
+         6"     : 801.22
+    flat_rate: 3.10
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 13.30
+         3/4"   : 19.95
+         1"     : 33.25
+         1 1/2" : 66.50
+         2"     : 106.40
+         3"     : 199.50
+         4"     : 332.50
+         6"     : 665.00
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 16.03
+         3/4"   : 24.03
+         1"     : 40.06
+         1 1/2" : 80.12
+         2"     : 128.19
+         3"     : 240.37
+         4"     : 400.61
+         6"     : 801.22
+    flat_rate: 3.10
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 13.30
+         3/4"   : 19.95
+         1"     : 33.25
+         1 1/2" : 66.50
+         2"     : 106.40
+         3"     : 199.50
+         4"     : 332.50
+         6"     : 665.00
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 16.03
+         3/4"   : 24.03
+         1"     : 40.06
+         1 1/2" : 80.12
+         2"     : 128.19
+         3"     : 240.37
+         4"     : 400.61
+         6"     : 801.22
+    flat_rate: 3.10
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  INSTITUTIONAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 13.30
+         3/4"   : 19.95
+         1"     : 33.25
+         1 1/2" : 66.50
+         2"     : 106.40
+         3"     : 199.50
+         4"     : 332.50
+         6"     : 665.00
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 16.03
+         3/4"   : 24.03
+         1"     : 40.06
+         1 1/2" : 80.12
+         2"     : 128.19
+         3"     : 240.37
+         4"     : 400.61
+         6"     : 801.22
+    flat_rate: 3.10
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
diff --git a/full_utility_rates/California/Del Oro/Del_Oro_09_Magalia_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_09_Magalia_District.owrs
new file mode 100644
index 00000000..ad1b9931
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_09_Magalia_District.owrs	
@@ -0,0 +1,142 @@
+# New Service Facility Fee:  Varies
+# New Service Advance Deposit: 182.25
+# Late Fee : 5.00
+metadata:
+  effective_date: 04/13/2015
+  utility_name: Del Oro Water Company - Magalia District
+  bill_frequency: monthly
+  bill_unit: kgal
+  prop_218_link: http://www.delorowater.com/deloro/water-districts/magalia-district.html
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 20.25
+         3/4"   : 30.38
+         1"     : 50.63
+         1 1/2" : 162.01 
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 5.16
+         3/4"   : 7.74
+         1"     : 12.89
+         1 1/2" : 41.26
+    flat_rate: 3.87 #converted gallons to ccf
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 20.25
+         3/4"   : 30.38
+         1"     : 50.63
+         1 1/2" : 162.01 
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 5.16
+         3/4"   : 7.74
+         1"     : 12.89
+         1 1/2" : 41.26
+    flat_rate: 3.87 #converted gallons to ccf
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 20.25
+         3/4"   : 30.38
+         1"     : 50.63
+         1 1/2" : 162.01 
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 5.16
+         3/4"   : 7.74
+         1"     : 12.89
+         1 1/2" : 41.26
+    flat_rate: 3.87 #converted gallons to ccf
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 20.25
+         3/4"   : 30.38
+         1"     : 50.63
+         1 1/2" : 162.01 
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 5.16
+         3/4"   : 7.74
+         1"     : 12.89
+         1 1/2" : 41.26
+    flat_rate: 3.87 #converted gallons to ccf
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 20.25
+         3/4"   : 30.38
+         1"     : 50.63
+         1 1/2" : 162.01 
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 5.16
+         3/4"   : 7.74
+         1"     : 12.89
+         1 1/2" : 41.26
+    flat_rate: 3.87 #converted gallons to ccf
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
+  INSTITUTIONAL:
+      service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 20.25
+         3/4"   : 30.38
+         1"     : 50.63
+         1 1/2" : 162.01 
+    srf_surcharge:
+#this is a special charge not applied to all customers
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 5.16
+         3/4"   : 7.74
+         1"     : 12.89
+         1 1/2" : 41.26
+    flat_rate: 3.87 #converted gallons to ccf
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + srf_surcharge + commodity_charge)
+    bill: commodity_charge+srf_surcharge+service_charge+utility_surcharge
diff --git a/full_utility_rates/California/Del Oro/Del_Oro_10_Metropolitan_District.owrs b/full_utility_rates/California/Del Oro/Del_Oro_10_Metropolitan_District.owrs
new file mode 100644
index 00000000..626048b1
--- /dev/null
+++ b/full_utility_rates/California/Del Oro/Del_Oro_10_Metropolitan_District.owrs	
@@ -0,0 +1,93 @@
+# New Service Advance Deposit: 213.92
+# Late Fee : 5.00
+metadata:
+  effective_date: 03/02/2017
+  utility_name: Del Oro Water Company - Metropolitan District
+  bill_frequency: monthly
+  bill_unit: ccf
+  prop_218_link: http://www.delorowater.com/deloro/water-districts/metropolitan.html
+rate_structure:
+  RESIDENTIAL_SINGLE:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 26.74
+         3/4"   : 40.10
+         1"     : 66.84
+         1 1/2" : 133.68
+         2"     : 213.89
+    flat_rate: 2.266
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  RESIDENTIAL_MULTI:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 26.74
+         3/4"   : 40.10
+         1"     : 66.84
+         1 1/2" : 133.68
+         2"     : 213.89
+    flat_rate: 2.266
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  IRRIGATION:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 26.74
+         3/4"   : 40.10
+         1"     : 66.84
+         1 1/2" : 133.68
+         2"     : 213.89
+    flat_rate: 2.266
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  COMMERCIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 26.74
+         3/4"   : 40.10
+         1"     : 66.84
+         1 1/2" : 133.68
+         2"     : 213.89
+    flat_rate: 2.266
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INDUSTRIAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 26.74
+         3/4"   : 40.10
+         1"     : 66.84
+         1 1/2" : 133.68
+         2"     : 213.89
+    flat_rate: 2.266
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge
+  INSTITUTIONAL:
+    service_charge:
+      depends_on: 
+        - meter_size
+      values:
+         5/8"   : 26.74
+         3/4"   : 40.10
+         1"     : 66.84
+         1 1/2" : 133.68
+         2"     : 213.89
+    flat_rate: 2.266
+    commodity_charge: flat_rate * usage_ccf
+    utility_surcharge: 0.014 * (service_charge + commodity_charge)
+    bill: commodity_charge+service_charge+utility_surcharge