diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index b7214b54b4..1ed0d0d853 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -13,6 +13,13 @@ EIA 860
 ~~~~~~~
 * Added EIA 860 final release data from 2023. See :issue:`3684` and PR :pr:`3871`.
 
+EIA 861
+~~~~~~~
+* Added EIA 861 final release data from 2023. See :issue:`3905` and PR :pr:`3911`. This
+  includes a new ``energy_capacity_mwh`` field for battery storage in
+  :ref:`core_eia861__yearly_net_metering_customer_fuel_class` and
+  :ref:`core_eia861__yearly_non_net_metering_customer_fuel_class`.
+
 EIA 923
 ~~~~~~~
 * Added EIA 923 final release data from 2023 and revised data from 2022. See
diff --git a/migrations/versions/450d100cd30b_add_under_1mw_and_over_1mw_to_tech_enums.py b/migrations/versions/450d100cd30b_add_under_1mw_and_over_1mw_to_tech_enums.py
new file mode 100644
index 0000000000..b5216914ff
--- /dev/null
+++ b/migrations/versions/450d100cd30b_add_under_1mw_and_over_1mw_to_tech_enums.py
@@ -0,0 +1,62 @@
+"""add under 1mw and over 1mw to tech enums
+
+Revision ID: 450d100cd30b
+Revises: d52742bec92a
+Create Date: 2024-10-17 14:37:06.632766
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '450d100cd30b'
+down_revision = 'd52742bec92a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('core_eia861__yearly_distributed_generation_tech', schema=None) as batch_op:
+        batch_op.alter_column('tech_class',
+               existing_type=sa.VARCHAR(length=19),
+               type_=sa.Enum('backup', 'chp_cogen', 'combustion_turbine', 'fuel_cell', 'hydro', 'internal_combustion', 'other', 'pv', 'steam', 'storage_pv', 'storage_nonpv', 'all_storage', 'total', 'virtual_pv', 'virtual_pv_under_1mw', 'virtual_pv_over_1mw', 'wind'),
+               existing_nullable=True)
+
+    with op.batch_alter_table('core_eia861__yearly_net_metering_customer_fuel_class', schema=None) as batch_op:
+        batch_op.alter_column('tech_class',
+               existing_type=sa.VARCHAR(length=19),
+               type_=sa.Enum('backup', 'chp_cogen', 'combustion_turbine', 'fuel_cell', 'hydro', 'internal_combustion', 'other', 'pv', 'steam', 'storage_pv', 'storage_nonpv', 'all_storage', 'total', 'virtual_pv', 'virtual_pv_under_1mw', 'virtual_pv_over_1mw', 'wind'),
+               existing_nullable=True)
+
+    with op.batch_alter_table('core_eia861__yearly_non_net_metering_customer_fuel_class', schema=None) as batch_op:
+        batch_op.alter_column('tech_class',
+               existing_type=sa.VARCHAR(length=19),
+               type_=sa.Enum('backup', 'chp_cogen', 'combustion_turbine', 'fuel_cell', 'hydro', 'internal_combustion', 'other', 'pv', 'steam', 'storage_pv', 'storage_nonpv', 'all_storage', 'total', 'virtual_pv', 'virtual_pv_under_1mw', 'virtual_pv_over_1mw', 'wind'),
+               existing_nullable=True)
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('core_eia861__yearly_non_net_metering_customer_fuel_class', schema=None) as batch_op:
+        batch_op.alter_column('tech_class',
+               existing_type=sa.Enum('backup', 'chp_cogen', 'combustion_turbine', 'fuel_cell', 'hydro', 'internal_combustion', 'other', 'pv', 'steam', 'storage_pv', 'storage_nonpv', 'all_storage', 'total', 'virtual_pv', 'virtual_pv_under_1mw', 'virtual_pv_over_1mw', 'wind'),
+               type_=sa.VARCHAR(length=19),
+               existing_nullable=True)
+
+    with op.batch_alter_table('core_eia861__yearly_net_metering_customer_fuel_class', schema=None) as batch_op:
+        batch_op.alter_column('tech_class',
+               existing_type=sa.Enum('backup', 'chp_cogen', 'combustion_turbine', 'fuel_cell', 'hydro', 'internal_combustion', 'other', 'pv', 'steam', 'storage_pv', 'storage_nonpv', 'all_storage', 'total', 'virtual_pv', 'virtual_pv_under_1mw', 'virtual_pv_over_1mw', 'wind'),
+               type_=sa.VARCHAR(length=19),
+               existing_nullable=True)
+
+    with op.batch_alter_table('core_eia861__yearly_distributed_generation_tech', schema=None) as batch_op:
+        batch_op.alter_column('tech_class',
+               existing_type=sa.Enum('backup', 'chp_cogen', 'combustion_turbine', 'fuel_cell', 'hydro', 'internal_combustion', 'other', 'pv', 'steam', 'storage_pv', 'storage_nonpv', 'all_storage', 'total', 'virtual_pv', 'virtual_pv_under_1mw', 'virtual_pv_over_1mw', 'wind'),
+               type_=sa.VARCHAR(length=19),
+               existing_nullable=True)
+
+    # ### end Alembic commands ###
diff --git a/migrations/versions/d52742bec92a_add_energy_capacity_mwh_to_net_and_non_.py b/migrations/versions/d52742bec92a_add_energy_capacity_mwh_to_net_and_non_.py
new file mode 100644
index 0000000000..9c58c3af71
--- /dev/null
+++ b/migrations/versions/d52742bec92a_add_energy_capacity_mwh_to_net_and_non_.py
@@ -0,0 +1,38 @@
+"""Add energy_capacity_mwh to net and non-net generation tables
+
+Revision ID: d52742bec92a
+Revises: 1fd5fac43603
+Create Date: 2024-10-17 09:48:45.659743
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd52742bec92a'
+down_revision = '1fd5fac43603'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('core_eia861__yearly_net_metering_customer_fuel_class', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('energy_capacity_mwh', sa.Float(), nullable=True, comment='The total amount of energy which the system can supply power before recharging is necessary, in megawatt-hours.'))
+
+    with op.batch_alter_table('core_eia861__yearly_non_net_metering_customer_fuel_class', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('energy_capacity_mwh', sa.Float(), nullable=True, comment='The total amount of energy which the system can supply power before recharging is necessary, in megawatt-hours.'))
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('core_eia861__yearly_non_net_metering_customer_fuel_class', schema=None) as batch_op:
+        batch_op.drop_column('energy_capacity_mwh')
+
+    with op.batch_alter_table('core_eia861__yearly_net_metering_customer_fuel_class', schema=None) as batch_op:
+        batch_op.drop_column('energy_capacity_mwh')
+
+    # ### end Alembic commands ###
diff --git a/src/pudl/metadata/classes.py b/src/pudl/metadata/classes.py
index 4ef2d4b0fd..fd51458c45 100644
--- a/src/pudl/metadata/classes.py
+++ b/src/pudl/metadata/classes.py
@@ -1642,6 +1642,16 @@ def enforce_schema(self, df: pd.DataFrame) -> pd.DataFrame:
                 f"schema: {missing_cols}"
             )
 
+        # Log warning if columns in dataframe are getting dropped in write
+        dropped_columns = list(df.columns.difference(expected_cols))
+        if dropped_columns:
+            logger.info(
+                "The following columns are getting dropped when the table is written:"
+                f"{dropped_columns}. This is often the intended behavior. If you want "
+                "to keep any of these columns, add them to the metadata.resources "
+                "fields and update alembic."
+            )
+
         df = self.format_df(df)
         pk = self.schema.primary_key
         if pk and not (dupes := df[df.duplicated(subset=pk)]).empty:
diff --git a/src/pudl/metadata/enums.py b/src/pudl/metadata/enums.py
index 79384bc927..dcdb53565a 100644
--- a/src/pudl/metadata/enums.py
+++ b/src/pudl/metadata/enums.py
@@ -62,6 +62,7 @@
     "SPP_TRE",
     "ERCOT_TRE",
     "MISO_TRE",
+    "FRCC_SERC",
     "VI",  # Virgin Islands
     "GU",  # Guam
     "PR",  # Puerto Rico
@@ -174,9 +175,12 @@
     "pv",
     "steam",
     "storage_pv",
+    "storage_nonpv",
     "all_storage",  # need 'all' as prefix so as not to confuse with other storage category
     "total",
     "virtual_pv",
+    "virtual_pv_under_1mw",  # Broken out in EIA 861 in 2023
+    "virtual_pv_over_1mw",  # Broken out in EIA 861 in 2023
     "wind",
 ]
 
diff --git a/src/pudl/metadata/fields.py b/src/pudl/metadata/fields.py
index aeba9ba9c4..820c3b8d81 100644
--- a/src/pudl/metadata/fields.py
+++ b/src/pudl/metadata/fields.py
@@ -1167,6 +1167,11 @@
         "description": "Account balance at end of year.",
         "unit": "USD",
     },
+    "energy_capacity_mwh": {
+        "type": "number",
+        "description": "The total amount of energy which the system can supply power before recharging is necessary, in megawatt-hours.",
+        "unit": "MWh",
+    },
     "energy_charges": {
         "type": "number",
         "description": "Energy charges (USD).",
diff --git a/src/pudl/metadata/resources/eia861.py b/src/pudl/metadata/resources/eia861.py
index ccd4b8c85a..47d4b63d56 100644
--- a/src/pudl/metadata/resources/eia861.py
+++ b/src/pudl/metadata/resources/eia861.py
@@ -466,6 +466,7 @@
             "fields": [
                 "balancing_authority_code_eia",
                 "capacity_mw",
+                "energy_capacity_mwh",
                 "customer_class",
                 "customers",
                 "report_date",
@@ -513,6 +514,7 @@
             "fields": [
                 "balancing_authority_code_eia",
                 "capacity_mw",
+                "energy_capacity_mwh",
                 "customer_class",
                 "report_date",
                 "state",
diff --git a/src/pudl/metadata/sources.py b/src/pudl/metadata/sources.py
index 6cf1ac0654..fba172f20b 100644
--- a/src/pudl/metadata/sources.py
+++ b/src/pudl/metadata/sources.py
@@ -211,7 +211,7 @@
         ),
         "field_namespace": "eia",
         "working_partitions": {
-            "years": sorted(set(range(2001, 2023))),
+            "years": sorted(set(range(2001, 2024))),
         },
         "contributors": [],
         "keywords": sorted(
diff --git a/src/pudl/package_data/eia861/column_maps/advanced_metering_infrastructure_eia861.csv b/src/pudl/package_data/eia861/column_maps/advanced_metering_infrastructure_eia861.csv
index 80c0d91584..223abacdf6 100644
--- a/src/pudl/package_data/eia861/column_maps/advanced_metering_infrastructure_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/advanced_metering_infrastructure_eia861.csv
@@ -1,49 +1,49 @@
-year_index,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-entity_type,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,3,3
-short_form,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4
-state,4,4,4,4,4,4,4,4,4,4,4,4,5,5,5,5
-balancing_authority_code_eia,-1,-1,-1,-1,-1,-1,-1,-1,5,5,5,5,6,6,6,6
-residential_automated_meter_reading,5,5,5,5,5,5,5,5,6,6,6,6,7,7,7,7
-commercial_automated_meter_reading,6,6,6,6,6,6,6,6,7,7,7,7,8,8,8,8
-industrial_automated_meter_reading,7,7,7,7,7,7,7,7,8,8,8,8,9,9,9,9
-transportation_automated_meter_reading,8,8,8,8,8,8,8,8,9,9,9,9,10,10,10,10
-total_automated_meter_reading,9,9,9,9,9,9,9,9,10,10,10,10,11,11,11,11
-residential_advanced_metering_infrastructure,10,10,10,10,10,10,10,10,11,11,11,11,12,12,12,12
-commercial_advanced_metering_infrastructure,11,11,11,11,11,11,11,11,12,12,12,12,13,13,13,13
-industrial_advanced_metering_infrastructure,12,12,12,12,12,12,12,12,13,13,13,13,14,14,14,14
-transportation_advanced_metering_infrastructure,13,13,13,13,13,13,13,13,14,14,14,14,15,15,15,15
-total_advanced_metering_infrastructure,14,14,14,14,14,14,14,14,15,15,15,15,16,16,16,16
-residential_home_area_network,-1,-1,-1,-1,-1,-1,15,15,16,16,16,16,17,17,17,17
-commercial_home_area_network,-1,-1,-1,-1,-1,-1,16,16,17,17,17,17,18,18,18,18
-industrial_home_area_network,-1,-1,-1,-1,-1,-1,17,17,18,18,18,18,19,19,19,19
-transportation_home_area_network,-1,-1,-1,-1,-1,-1,18,18,19,19,19,19,20,20,20,20
-total_home_area_network,-1,-1,-1,-1,-1,-1,19,19,20,20,20,20,21,21,21,21
-residential_non_amr_ami,-1,-1,-1,-1,-1,-1,20,20,21,21,21,21,22,22,22,22
-commercial_non_amr_ami,-1,-1,-1,-1,-1,-1,21,21,22,22,22,22,23,23,23,23
-industrial_non_amr_ami,-1,-1,-1,-1,-1,-1,22,22,23,23,23,23,24,24,24,24
-transportation_non_amr_ami,-1,-1,-1,-1,-1,-1,23,23,24,24,24,24,25,25,25,25
-total_non_amr_ami,-1,-1,-1,-1,-1,-1,24,24,25,25,25,25,26,26,26,26
-residential_total_meters,-1,-1,-1,-1,-1,-1,25,25,26,26,26,26,27,27,27,27
-commercial_total_meters,-1,-1,-1,-1,-1,-1,26,26,27,27,27,27,28,28,28,28
-industrial_total_meters,-1,-1,-1,-1,-1,-1,27,27,28,28,28,28,29,29,29,29
-transportation_total_meters,-1,-1,-1,-1,-1,-1,28,28,29,29,29,29,30,30,30,30
-total_total_meters,-1,-1,-1,-1,-1,-1,29,29,30,30,30,30,31,31,31,31
-residential_energy_served_ami_mwh,15,15,15,15,15,15,30,30,31,31,31,31,32,32,32,32
-commercial_energy_served_ami_mwh,16,16,16,16,16,16,31,31,32,32,32,32,33,33,33,33
-industrial_energy_served_ami_mwh,17,17,17,17,17,17,32,32,33,33,33,33,34,34,34,34
-transportation_energy_served_ami_mwh,18,18,18,18,18,18,33,33,34,34,34,34,35,35,35,35
-total_energy_served_ami_mwh,19,19,19,19,19,19,34,34,35,35,35,35,36,36,36,36
-residential_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,35,35,36,36,36,36,37,37,37,37
-commercial_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,36,36,37,37,37,37,38,38,38,38
-industrial_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,37,37,38,38,38,38,39,39,39,39
-transportation_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,38,38,39,39,39,39,40,40,40,40
-total_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,39,39,40,40,40,40,41,41,41,41
-residential_direct_load_control_customers,-1,-1,-1,-1,-1,-1,40,40,41,41,41,41,42,42,42,42
-commercial_direct_load_control_customers,-1,-1,-1,-1,-1,-1,41,41,42,42,42,42,43,43,43,43
-industrial_direct_load_control_customers,-1,-1,-1,-1,-1,-1,42,42,43,43,43,43,44,44,44,44
-transportation_direct_load_control_customers,-1,-1,-1,-1,-1,-1,43,43,44,44,44,44,45,45,45,45
-total_direct_load_control_customers,-1,-1,-1,-1,-1,-1,44,44,45,45,45,45,46,46,46,46
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0
+year_index,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+entity_type,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,3,3,3
+short_form,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4
+state,4,4,4,4,4,4,4,4,4,4,4,4,5,5,5,5,5
+balancing_authority_code_eia,-1,-1,-1,-1,-1,-1,-1,-1,5,5,5,5,6,6,6,6,6
+residential_automated_meter_reading,5,5,5,5,5,5,5,5,6,6,6,6,7,7,7,7,7
+commercial_automated_meter_reading,6,6,6,6,6,6,6,6,7,7,7,7,8,8,8,8,8
+industrial_automated_meter_reading,7,7,7,7,7,7,7,7,8,8,8,8,9,9,9,9,9
+transportation_automated_meter_reading,8,8,8,8,8,8,8,8,9,9,9,9,10,10,10,10,10
+total_automated_meter_reading,9,9,9,9,9,9,9,9,10,10,10,10,11,11,11,11,11
+residential_advanced_metering_infrastructure,10,10,10,10,10,10,10,10,11,11,11,11,12,12,12,12,12
+commercial_advanced_metering_infrastructure,11,11,11,11,11,11,11,11,12,12,12,12,13,13,13,13,13
+industrial_advanced_metering_infrastructure,12,12,12,12,12,12,12,12,13,13,13,13,14,14,14,14,14
+transportation_advanced_metering_infrastructure,13,13,13,13,13,13,13,13,14,14,14,14,15,15,15,15,15
+total_advanced_metering_infrastructure,14,14,14,14,14,14,14,14,15,15,15,15,16,16,16,16,16
+residential_home_area_network,-1,-1,-1,-1,-1,-1,15,15,16,16,16,16,17,17,17,17,17
+commercial_home_area_network,-1,-1,-1,-1,-1,-1,16,16,17,17,17,17,18,18,18,18,18
+industrial_home_area_network,-1,-1,-1,-1,-1,-1,17,17,18,18,18,18,19,19,19,19,19
+transportation_home_area_network,-1,-1,-1,-1,-1,-1,18,18,19,19,19,19,20,20,20,20,20
+total_home_area_network,-1,-1,-1,-1,-1,-1,19,19,20,20,20,20,21,21,21,21,21
+residential_non_amr_ami,-1,-1,-1,-1,-1,-1,20,20,21,21,21,21,22,22,22,22,22
+commercial_non_amr_ami,-1,-1,-1,-1,-1,-1,21,21,22,22,22,22,23,23,23,23,23
+industrial_non_amr_ami,-1,-1,-1,-1,-1,-1,22,22,23,23,23,23,24,24,24,24,24
+transportation_non_amr_ami,-1,-1,-1,-1,-1,-1,23,23,24,24,24,24,25,25,25,25,25
+total_non_amr_ami,-1,-1,-1,-1,-1,-1,24,24,25,25,25,25,26,26,26,26,26
+residential_total_meters,-1,-1,-1,-1,-1,-1,25,25,26,26,26,26,27,27,27,27,27
+commercial_total_meters,-1,-1,-1,-1,-1,-1,26,26,27,27,27,27,28,28,28,28,28
+industrial_total_meters,-1,-1,-1,-1,-1,-1,27,27,28,28,28,28,29,29,29,29,29
+transportation_total_meters,-1,-1,-1,-1,-1,-1,28,28,29,29,29,29,30,30,30,30,30
+total_total_meters,-1,-1,-1,-1,-1,-1,29,29,30,30,30,30,31,31,31,31,31
+residential_energy_served_ami_mwh,15,15,15,15,15,15,30,30,31,31,31,31,32,32,32,32,32
+commercial_energy_served_ami_mwh,16,16,16,16,16,16,31,31,32,32,32,32,33,33,33,33,33
+industrial_energy_served_ami_mwh,17,17,17,17,17,17,32,32,33,33,33,33,34,34,34,34,34
+transportation_energy_served_ami_mwh,18,18,18,18,18,18,33,33,34,34,34,34,35,35,35,35,35
+total_energy_served_ami_mwh,19,19,19,19,19,19,34,34,35,35,35,35,36,36,36,36,36
+residential_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,35,35,36,36,36,36,37,37,37,37,37
+commercial_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,36,36,37,37,37,37,38,38,38,38,38
+industrial_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,37,37,38,38,38,38,39,39,39,39,39
+transportation_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,38,38,39,39,39,39,40,40,40,40,40
+total_daily_digital_access_customers,-1,-1,-1,-1,-1,-1,39,39,40,40,40,40,41,41,41,41,41
+residential_direct_load_control_customers,-1,-1,-1,-1,-1,-1,40,40,41,41,41,41,42,42,42,42,42
+commercial_direct_load_control_customers,-1,-1,-1,-1,-1,-1,41,41,42,42,42,42,43,43,43,43,43
+industrial_direct_load_control_customers,-1,-1,-1,-1,-1,-1,42,42,43,43,43,43,44,44,44,44,44
+transportation_direct_load_control_customers,-1,-1,-1,-1,-1,-1,43,43,44,44,44,44,45,45,45,45,45
+total_direct_load_control_customers,-1,-1,-1,-1,-1,-1,44,44,45,45,45,45,46,46,46,46,46
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/balancing_authority_eia861.csv b/src/pudl/package_data/eia861/column_maps/balancing_authority_eia861.csv
index 55831ba373..a6d34dc052 100644
--- a/src/pudl/package_data/eia861/column_maps/balancing_authority_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/balancing_authority_eia861.csv
@@ -1,9 +1,9 @@
-year_index,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-utility_name_eia,-1,2,2,2,2,-1,-1,-1,-1,-1,-1,2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-balancing_authority_id_eia,2,3,3,3,3,2,2,2,2,2,2,3,1,1,1,1,1,1,1,1,1,1
-balancing_authority_code_eia,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2
-state,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,3,3,3,3,3,3,3,3
-balancing_authority_name_eia,3,4,4,4,4,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+utility_name_eia,-1,2,2,2,2,-1,-1,-1,-1,-1,-1,2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+balancing_authority_id_eia,2,3,3,3,3,2,2,2,2,2,2,3,1,1,1,1,1,1,1,1,1,1,1
+balancing_authority_code_eia,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2,2
+state,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,3,3,3,3,3,3,3,3,3
+balancing_authority_name_eia,3,4,4,4,4,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/delivery_companies_eia861.csv b/src/pudl/package_data/eia861/column_maps/delivery_companies_eia861.csv
index b8d41d93d2..b764251fb5 100644
--- a/src/pudl/package_data/eia861/column_maps/delivery_companies_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/delivery_companies_eia861.csv
@@ -1,26 +1,26 @@
-year_index,2020,2021,2022
-report_year,0,0,0
-utility_id_eia,1,1,1
-utility_name_eia,2,2,2
-business_model,3,3,3
-service_type,4,4,4
-data_observed,5,5,5
-state,6,6,6
-entity_type,7,7,7
-balancing_authority_code_eia,8,8,8
-residential_sales_revenue,9,9,9
-residential_sales_mwh,10,10,10
-residential_customers,11,11,11
-commercial_sales_revenue,12,12,12
-commercial_sales_mwh,13,13,13
-commercial_customers,14,14,14
-industrial_sales_revenue,15,15,15
-industrial_sales_mwh,16,16,16
-industrial_customers,17,17,17
-transportation_sales_revenue,18,18,18
-transportation_sales_mwh,19,19,19
-transportation_customers,20,20,20
-total_sales_revenue,21,21,21
-total_sales_mwh,22,22,22
-total_customers,23,23,23
-early_release,-1,-1,-1
+year_index,2020,2021,2022,2023
+report_year,0,0,0,0
+utility_id_eia,1,1,1,1
+utility_name_eia,2,2,2,2
+business_model,3,3,3,3
+service_type,4,4,4,4
+data_observed,5,5,5,5
+state,6,6,6,6
+entity_type,7,7,7,7
+balancing_authority_code_eia,8,8,8,8
+residential_sales_revenue,9,9,9,9
+residential_sales_mwh,10,10,10,10
+residential_customers,11,11,11,11
+commercial_sales_revenue,12,12,12,12
+commercial_sales_mwh,13,13,13,13
+commercial_customers,14,14,14,14
+industrial_sales_revenue,15,15,15,15
+industrial_sales_mwh,16,16,16,16
+industrial_customers,17,17,17,17
+transportation_sales_revenue,18,18,18,18
+transportation_sales_mwh,19,19,19,19
+transportation_customers,20,20,20,20
+total_sales_revenue,21,21,21,21
+total_sales_mwh,22,22,22,22
+total_customers,23,23,23,23
+early_release,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/demand_response_eia861.csv b/src/pudl/package_data/eia861/column_maps/demand_response_eia861.csv
index 262a4ee203..0cfb52d193 100644
--- a/src/pudl/package_data/eia861/column_maps/demand_response_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/demand_response_eia861.csv
@@ -1,39 +1,39 @@
-year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2,2,2,2
-short_form,-1,-1,-1,-1,-1,-1,3,-1,-1,-1
-state,3,3,3,3,3,3,4,3,3,3
-balancing_authority_code_eia,-1,-1,-1,-1,4,4,5,4,4,4
-residential_customers,4,4,4,4,5,5,6,5,5,5
-commercial_customers,5,5,5,5,6,6,7,6,6,6
-industrial_customers,6,6,6,6,7,7,8,7,7,7
-transportation_customers,7,7,7,7,8,8,9,8,8,8
-total_customers,8,8,8,8,9,9,10,9,9,9
-residential_energy_savings_mwh,9,9,9,9,10,10,11,10,10,10
-commercial_energy_savings_mwh,10,10,10,10,11,11,12,11,11,11
-industrial_energy_savings_mwh,11,11,11,11,12,12,13,12,12,12
-transportation_energy_savings_mwh,12,12,12,12,13,13,14,13,13,13
-total_energy_savings_mwh,13,13,13,13,14,14,15,14,14,14
-residential_potential_peak_demand_savings_mw,14,14,14,14,15,15,16,15,15,15
-commercial_potential_peak_demand_savings_mw,15,15,15,15,16,16,17,16,16,16
-industrial_potential_peak_demand_savings_mw,16,16,16,16,17,17,18,17,17,17
-transportation_potential_peak_demand_savings_mw,17,17,17,17,18,18,19,18,18,18
-total_potential_peak_demand_savings_mw,18,18,18,18,19,19,20,19,19,19
-residential_actual_peak_demand_savings_mw,19,19,19,19,20,20,21,20,20,20
-commercial_actual_peak_demand_savings_mw,20,20,20,20,21,21,22,21,21,21
-industrial_actual_peak_demand_savings_mw,21,21,21,21,22,22,23,22,22,22
-transportation_actual_peak_demand_savings_mw,22,22,22,22,23,23,24,23,23,23
-total_actual_peak_demand_savings_mw,23,23,23,23,24,24,25,24,24,24
-residential_customer_incentives_cost,24,24,24,24,25,25,26,25,25,25
-commercial_customer_incentives_cost,25,25,25,25,26,26,27,26,26,26
-industrial_customer_incentives_cost,26,26,26,26,27,27,28,27,27,27
-transportation_customer_incentives_cost,27,27,27,27,28,28,29,28,28,28
-total_customer_incentives_cost,28,28,28,28,29,29,30,29,29,29
-residential_other_costs,29,29,29,29,30,30,31,30,30,30
-commercial_other_costs,30,30,30,30,31,31,32,31,31,31
-industrial_other_costs,31,31,31,31,32,32,33,32,32,32
-transportation_other_costs,32,32,32,32,33,33,34,33,33,33
-total_other_costs,33,33,33,33,34,34,35,34,34,34
-num_water_heaters,34,34,34,34,35,35,36,35,35,35
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,2,2,2,2
+short_form,-1,-1,-1,-1,-1,-1,3,-1,-1,-1,-1
+state,3,3,3,3,3,3,4,3,3,3,3
+balancing_authority_code_eia,-1,-1,-1,-1,4,4,5,4,4,4,4
+residential_customers,4,4,4,4,5,5,6,5,5,5,5
+commercial_customers,5,5,5,5,6,6,7,6,6,6,6
+industrial_customers,6,6,6,6,7,7,8,7,7,7,7
+transportation_customers,7,7,7,7,8,8,9,8,8,8,8
+total_customers,8,8,8,8,9,9,10,9,9,9,9
+residential_energy_savings_mwh,9,9,9,9,10,10,11,10,10,10,10
+commercial_energy_savings_mwh,10,10,10,10,11,11,12,11,11,11,11
+industrial_energy_savings_mwh,11,11,11,11,12,12,13,12,12,12,12
+transportation_energy_savings_mwh,12,12,12,12,13,13,14,13,13,13,13
+total_energy_savings_mwh,13,13,13,13,14,14,15,14,14,14,14
+residential_potential_peak_demand_savings_mw,14,14,14,14,15,15,16,15,15,15,15
+commercial_potential_peak_demand_savings_mw,15,15,15,15,16,16,17,16,16,16,16
+industrial_potential_peak_demand_savings_mw,16,16,16,16,17,17,18,17,17,17,17
+transportation_potential_peak_demand_savings_mw,17,17,17,17,18,18,19,18,18,18,18
+total_potential_peak_demand_savings_mw,18,18,18,18,19,19,20,19,19,19,19
+residential_actual_peak_demand_savings_mw,19,19,19,19,20,20,21,20,20,20,20
+commercial_actual_peak_demand_savings_mw,20,20,20,20,21,21,22,21,21,21,21
+industrial_actual_peak_demand_savings_mw,21,21,21,21,22,22,23,22,22,22,22
+transportation_actual_peak_demand_savings_mw,22,22,22,22,23,23,24,23,23,23,23
+total_actual_peak_demand_savings_mw,23,23,23,23,24,24,25,24,24,24,24
+residential_customer_incentives_cost,24,24,24,24,25,25,26,25,25,25,25
+commercial_customer_incentives_cost,25,25,25,25,26,26,27,26,26,26,26
+industrial_customer_incentives_cost,26,26,26,26,27,27,28,27,27,27,27
+transportation_customer_incentives_cost,27,27,27,27,28,28,29,28,28,28,28
+total_customer_incentives_cost,28,28,28,28,29,29,30,29,29,29,29
+residential_other_costs,29,29,29,29,30,30,31,30,30,30,30
+commercial_other_costs,30,30,30,30,31,31,32,31,31,31,31
+industrial_other_costs,31,31,31,31,32,32,33,32,32,32,32
+transportation_other_costs,32,32,32,32,33,33,34,33,33,33,33
+total_other_costs,33,33,33,33,34,34,35,34,34,34,34
+num_water_heaters,34,34,34,34,35,35,36,35,35,35,35
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/distribution_systems_eia861.csv b/src/pudl/package_data/eia861/column_maps/distribution_systems_eia861.csv
index 6413725ebc..600deff10f 100644
--- a/src/pudl/package_data/eia861/column_maps/distribution_systems_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/distribution_systems_eia861.csv
@@ -1,9 +1,9 @@
-year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2,2,2,2
-short_form,-1,-1,-1,-1,-1,-1,3,-1,-1,-1
-state,3,3,3,3,3,3,4,3,3,3
-distribution_circuits,4,4,4,4,4,4,5,4,4,4
-circuits_with_voltage_optimization,5,5,5,5,5,5,6,5,5,5
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,2,2,2,2
+short_form,-1,-1,-1,-1,-1,-1,3,-1,-1,-1,-1
+state,3,3,3,3,3,3,4,3,3,3,3
+distribution_circuits,4,4,4,4,4,4,5,4,4,4,4
+circuits_with_voltage_optimization,5,5,5,5,5,5,6,5,5,5,5
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/dynamic_pricing_eia861.csv b/src/pudl/package_data/eia861/column_maps/dynamic_pricing_eia861.csv
index d3067eef1b..1c204d16ea 100644
--- a/src/pudl/package_data/eia861/column_maps/dynamic_pricing_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/dynamic_pricing_eia861.csv
@@ -1,33 +1,33 @@
-year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2,2,2,2
-short_form,-1,-1,-1,-1,-1,-1,3,3,3,3
-state,3,3,3,3,3,3,4,4,4,4
-balancing_authority_code_eia,-1,-1,-1,-1,4,4,5,5,5,5
-residential_customers,4,4,4,4,5,5,6,6,6,6
-commercial_customers,5,5,5,5,6,6,7,7,7,7
-industrial_customers,6,6,6,6,7,7,8,8,8,8
-transportation_customers,7,7,7,7,8,8,9,9,9,9
-total_customers,8,8,8,8,9,9,10,10,10,10
-residential_time_of_use_pricing,9,9,9,9,10,10,11,11,11,11
-commercial_time_of_use_pricing,10,10,10,10,11,11,12,12,12,12
-industrial_time_of_use_pricing,11,11,11,11,12,12,13,13,13,13
-transportation_time_of_use_pricing,12,12,12,12,13,13,14,14,14,14
-residential_real_time_pricing,13,13,13,13,14,14,15,15,15,15
-commercial_real_time_pricing,14,14,14,14,15,15,16,16,16,16
-industrial_real_time_pricing,15,15,15,15,16,16,17,17,17,17
-transportation_real_time_pricing,16,16,16,16,17,17,18,18,18,18
-residential_variable_peak_pricing,17,17,17,17,18,18,19,19,19,19
-commercial_variable_peak_pricing,18,18,18,18,19,19,20,20,20,20
-industrial_variable_peak_pricing,19,19,19,19,20,20,21,21,21,21
-transportation_variable_peak_pricing,20,20,20,20,21,21,22,22,22,22
-residential_critical_peak_pricing,21,21,21,21,22,22,23,23,23,23
-commercial_critical_peak_pricing,22,22,22,22,23,23,24,24,24,24
-industrial_critical_peak_pricing,23,23,23,23,24,24,25,25,25,25
-transportation_critical_peak_pricing,24,24,24,24,25,25,26,26,26,26
-residential_critical_peak_rebate,25,25,25,25,26,26,27,27,27,27
-commercial_critical_peak_rebate,26,26,26,26,27,27,28,28,28,28
-industrial_critical_peak_rebate,27,27,27,27,28,28,29,29,29,29
-transportation_critical_peak_rebate,28,28,28,28,29,29,30,30,30,30
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,2,2,2,2
+short_form,-1,-1,-1,-1,-1,-1,3,3,3,3,3
+state,3,3,3,3,3,3,4,4,4,4,4
+balancing_authority_code_eia,-1,-1,-1,-1,4,4,5,5,5,5,5
+residential_customers,4,4,4,4,5,5,6,6,6,6,6
+commercial_customers,5,5,5,5,6,6,7,7,7,7,7
+industrial_customers,6,6,6,6,7,7,8,8,8,8,8
+transportation_customers,7,7,7,7,8,8,9,9,9,9,9
+total_customers,8,8,8,8,9,9,10,10,10,10,10
+residential_time_of_use_pricing,9,9,9,9,10,10,11,11,11,11,11
+commercial_time_of_use_pricing,10,10,10,10,11,11,12,12,12,12,12
+industrial_time_of_use_pricing,11,11,11,11,12,12,13,13,13,13,13
+transportation_time_of_use_pricing,12,12,12,12,13,13,14,14,14,14,14
+residential_real_time_pricing,13,13,13,13,14,14,15,15,15,15,15
+commercial_real_time_pricing,14,14,14,14,15,15,16,16,16,16,16
+industrial_real_time_pricing,15,15,15,15,16,16,17,17,17,17,17
+transportation_real_time_pricing,16,16,16,16,17,17,18,18,18,18,18
+residential_variable_peak_pricing,17,17,17,17,18,18,19,19,19,19,19
+commercial_variable_peak_pricing,18,18,18,18,19,19,20,20,20,20,20
+industrial_variable_peak_pricing,19,19,19,19,20,20,21,21,21,21,21
+transportation_variable_peak_pricing,20,20,20,20,21,21,22,22,22,22,22
+residential_critical_peak_pricing,21,21,21,21,22,22,23,23,23,23,23
+commercial_critical_peak_pricing,22,22,22,22,23,23,24,24,24,24,24
+industrial_critical_peak_pricing,23,23,23,23,24,24,25,25,25,25,25
+transportation_critical_peak_pricing,24,24,24,24,25,25,26,26,26,26,26
+residential_critical_peak_rebate,25,25,25,25,26,26,27,27,27,27,27
+commercial_critical_peak_rebate,26,26,26,26,27,27,28,28,28,28,28
+industrial_critical_peak_rebate,27,27,27,27,28,28,29,29,29,29,29
+transportation_critical_peak_rebate,28,28,28,28,29,29,30,30,30,30,30
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/energy_efficiency_eia861.csv b/src/pudl/package_data/eia861/column_maps/energy_efficiency_eia861.csv
index 03e28880e8..dd0f2f209e 100644
--- a/src/pudl/package_data/eia861/column_maps/energy_efficiency_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/energy_efficiency_eia861.csv
@@ -1,54 +1,54 @@
-year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2,2,2,2
-short_form,-1,-1,-1,-1,-1,-1,3,-1,-1,-1
-state,3,3,3,3,3,3,4,3,3,3
-balancing_authority_code_eia,4,4,4,4,4,4,5,4,4,4
-residential_incremental_energy_savings_mwh,5,5,5,5,5,5,6,5,5,5
-commercial_incremental_energy_savings_mwh,6,6,6,6,6,6,7,6,6,6
-industrial_incremental_energy_savings_mwh,7,7,7,7,7,7,8,7,7,7
-transportation_incremental_energy_savings_mwh,8,8,8,8,8,8,9,8,8,8
-total_incremental_energy_savings_mwh,9,9,9,9,9,9,10,9,9,9
-residential_incremental_peak_reduction_mw,10,10,10,10,10,10,11,10,10,10
-commercial_incremental_peak_reduction_mw,11,11,11,11,11,11,12,11,11,11
-industrial_incremental_peak_reduction_mw,12,12,12,12,12,12,13,12,12,12
-other_incremental_peak_reduction_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-transportation_incremental_peak_reduction_mw,13,13,13,13,13,13,14,13,13,13
-total_incremental_peak_reduction_mw,14,14,14,14,14,14,15,14,14,14
-residential_incremental_life_cycle_energy_savings_mwh,15,15,15,15,15,15,16,15,15,15
-commercial_incremental_life_cycle_energy_savings_mwh,16,16,16,16,16,16,17,16,16,16
-industrial_incremental_life_cycle_energy_savings_mwh,17,17,17,17,17,17,18,17,17,17
-transportation_incremental_life_cycle_energy_savings_mwh,18,18,18,18,18,18,19,18,18,18
-total_incremental_life_cycle_energy_savings_mwh,19,19,19,19,19,19,20,19,19,19
-residential_incremental_life_cycle_peak_reduction_mw,20,20,20,20,20,20,21,20,20,20
-commercial_incremental_life_cycle_peak_reduction_mw,21,21,21,21,21,21,22,21,21,21
-industrial_incremental_life_cycle_peak_reduction_mw,22,22,22,22,22,22,23,22,22,22
-transportation_incremental_life_cycle_peak_reduction_mw,23,23,23,23,23,23,24,23,23,23
-total_incremental_life_cycle_peak_reduction_mw,24,24,24,24,24,24,25,24,24,24
-residential_customer_incentives_incremental_cost,25,25,25,25,25,25,26,25,25,25
-commercial_customer_incentives_incremental_cost,26,26,26,26,26,26,27,26,26,26
-industrial_customer_incentives_incremental_cost,27,27,27,27,27,27,28,27,27,27
-transportation_customer_incentives_incremental_cost,28,28,28,28,28,28,29,28,28,28
-total_customer_incentives_incremental_cost,29,29,29,29,29,29,30,29,29,29
-residential_other_costs_incremental_cost,30,30,30,30,30,30,31,30,30,30
-commercial_other_costs_incremental_cost,31,31,31,31,31,31,32,31,31,31
-industrial_other_costs_incremental_cost,32,32,32,32,32,32,33,32,32,32
-transportation_other_costs_incremental_cost,33,33,33,33,33,33,34,33,33,33
-total_other_costs_incremental_cost,34,34,34,34,34,34,35,34,34,34
-residential_customer_incentives_incremental_life_cycle_cost,35,35,35,35,35,35,36,35,35,35
-commercial_customer_incentives_incremental_life_cycle_cost,36,36,36,36,36,36,37,36,36,36
-industrial_customer_incentives_incremental_life_cycle_cost,37,37,37,37,37,37,38,37,37,37
-transportation_customer_incentives_incremental_life_cycle_cost,38,38,38,38,38,38,39,38,38,38
-total_customer_incentives_incremental_life_cycle_cost,39,39,39,39,39,39,40,39,39,39
-residential_customer_other_costs_incremental_life_cycle_cost,40,40,40,40,40,40,41,40,40,40
-commercial_customer_other_costs_incremental_life_cycle_cost,41,41,41,41,41,41,42,41,41,41
-industrial_customer_other_costs_incremental_life_cycle_cost,42,42,42,42,42,42,43,42,42,42
-transportation_customer_other_costs_incremental_life_cycle_cost,43,43,43,43,43,43,44,43,43,43
-total_customer_other_costs_incremental_life_cycle_cost,44,44,44,44,44,44,45,44,44,44
-residential_weighted_average_life_years,45,45,45,45,45,45,46,45,45,45
-commercial_weighted_average_life_years,46,46,46,46,46,46,47,46,46,46
-industrial_weighted_average_life_years,47,47,47,47,47,47,48,47,47,47
-transportation_weighted_average_life_years,48,48,48,48,48,48,49,48,48,48
-website,49,49,49,49,49,49,50,49,49,49
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,2,2,2,2
+short_form,-1,-1,-1,-1,-1,-1,3,-1,-1,-1,-1
+state,3,3,3,3,3,3,4,3,3,3,3
+balancing_authority_code_eia,4,4,4,4,4,4,5,4,4,4,4
+residential_incremental_energy_savings_mwh,5,5,5,5,5,5,6,5,5,5,5
+commercial_incremental_energy_savings_mwh,6,6,6,6,6,6,7,6,6,6,6
+industrial_incremental_energy_savings_mwh,7,7,7,7,7,7,8,7,7,7,7
+transportation_incremental_energy_savings_mwh,8,8,8,8,8,8,9,8,8,8,8
+total_incremental_energy_savings_mwh,9,9,9,9,9,9,10,9,9,9,9
+residential_incremental_peak_reduction_mw,10,10,10,10,10,10,11,10,10,10,10
+commercial_incremental_peak_reduction_mw,11,11,11,11,11,11,12,11,11,11,11
+industrial_incremental_peak_reduction_mw,12,12,12,12,12,12,13,12,12,12,12
+other_incremental_peak_reduction_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+transportation_incremental_peak_reduction_mw,13,13,13,13,13,13,14,13,13,13,13
+total_incremental_peak_reduction_mw,14,14,14,14,14,14,15,14,14,14,14
+residential_incremental_life_cycle_energy_savings_mwh,15,15,15,15,15,15,16,15,15,15,15
+commercial_incremental_life_cycle_energy_savings_mwh,16,16,16,16,16,16,17,16,16,16,16
+industrial_incremental_life_cycle_energy_savings_mwh,17,17,17,17,17,17,18,17,17,17,17
+transportation_incremental_life_cycle_energy_savings_mwh,18,18,18,18,18,18,19,18,18,18,18
+total_incremental_life_cycle_energy_savings_mwh,19,19,19,19,19,19,20,19,19,19,19
+residential_incremental_life_cycle_peak_reduction_mw,20,20,20,20,20,20,21,20,20,20,20
+commercial_incremental_life_cycle_peak_reduction_mw,21,21,21,21,21,21,22,21,21,21,21
+industrial_incremental_life_cycle_peak_reduction_mw,22,22,22,22,22,22,23,22,22,22,22
+transportation_incremental_life_cycle_peak_reduction_mw,23,23,23,23,23,23,24,23,23,23,23
+total_incremental_life_cycle_peak_reduction_mw,24,24,24,24,24,24,25,24,24,24,24
+residential_customer_incentives_incremental_cost,25,25,25,25,25,25,26,25,25,25,25
+commercial_customer_incentives_incremental_cost,26,26,26,26,26,26,27,26,26,26,26
+industrial_customer_incentives_incremental_cost,27,27,27,27,27,27,28,27,27,27,27
+transportation_customer_incentives_incremental_cost,28,28,28,28,28,28,29,28,28,28,28
+total_customer_incentives_incremental_cost,29,29,29,29,29,29,30,29,29,29,29
+residential_other_costs_incremental_cost,30,30,30,30,30,30,31,30,30,30,30
+commercial_other_costs_incremental_cost,31,31,31,31,31,31,32,31,31,31,31
+industrial_other_costs_incremental_cost,32,32,32,32,32,32,33,32,32,32,32
+transportation_other_costs_incremental_cost,33,33,33,33,33,33,34,33,33,33,33
+total_other_costs_incremental_cost,34,34,34,34,34,34,35,34,34,34,34
+residential_customer_incentives_incremental_life_cycle_cost,35,35,35,35,35,35,36,35,35,35,35
+commercial_customer_incentives_incremental_life_cycle_cost,36,36,36,36,36,36,37,36,36,36,36
+industrial_customer_incentives_incremental_life_cycle_cost,37,37,37,37,37,37,38,37,37,37,37
+transportation_customer_incentives_incremental_life_cycle_cost,38,38,38,38,38,38,39,38,38,38,38
+total_customer_incentives_incremental_life_cycle_cost,39,39,39,39,39,39,40,39,39,39,39
+residential_customer_other_costs_incremental_life_cycle_cost,40,40,40,40,40,40,41,40,40,40,40
+commercial_customer_other_costs_incremental_life_cycle_cost,41,41,41,41,41,41,42,41,41,41,41
+industrial_customer_other_costs_incremental_life_cycle_cost,42,42,42,42,42,42,43,42,42,42,42
+transportation_customer_other_costs_incremental_life_cycle_cost,43,43,43,43,43,43,44,43,43,43,43
+total_customer_other_costs_incremental_life_cycle_cost,44,44,44,44,44,44,45,44,44,44,44
+residential_weighted_average_life_years,45,45,45,45,45,45,46,45,45,45,45
+commercial_weighted_average_life_years,46,46,46,46,46,46,47,46,46,46,46
+industrial_weighted_average_life_years,47,47,47,47,47,47,48,47,47,47,47
+transportation_weighted_average_life_years,48,48,48,48,48,48,49,48,48,48,48
+website,49,49,49,49,49,49,50,49,49,49,49
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/frame_eia861.csv b/src/pudl/package_data/eia861/column_maps/frame_eia861.csv
index 94f0c8b806..6af1993c66 100644
--- a/src/pudl/package_data/eia861/column_maps/frame_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/frame_eia861.csv
@@ -1,23 +1,23 @@
-year_index,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2
-ownership_code,3,3,3,4,4,4,4
-ownership,4,4,4,5,5,5,5
-monthly,-1,5,5,6,6,6,6
-short_form,5,6,6,3,3,3,3
-advanced_metering,6,7,7,7,7,7,7
-delivery_company,-1,-1,-1,-1,8,8,8
-demand_response,7,8,8,8,9,9,9
-distribution_systems,8,9,9,9,10,10,10
-dynamic_pricing,9,10,10,10,11,11,11
-energy_efficiency,10,11,11,11,12,12,12
-mergers,11,12,12,12,13,13,13
-has_net_metering,12,13,13,13,14,14,14
-non_net_metering_distributed,13,14,14,14,15,15,15
-operational_data,14,15,15,15,16,16,16
-reliability,15,16,16,16,17,17,17
-sales_to_ultimate_customers,16,17,17,17,18,18,18
-service_territory,17,18,18,18,19,19,19
-utility_data,18,19,19,19,20,20,20
-early_release,-1,-1,-1,-1,-1,-1,-1
+year_index,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,2
+ownership_code,3,3,3,4,4,4,4,4
+ownership,4,4,4,5,5,5,5,5
+monthly,-1,5,5,6,6,6,6,6
+short_form,5,6,6,3,3,3,3,3
+advanced_metering,6,7,7,7,7,7,7,7
+delivery_company,-1,-1,-1,-1,8,8,8,8
+demand_response,7,8,8,8,9,9,9,9
+distribution_systems,8,9,9,9,10,10,10,10
+dynamic_pricing,9,10,10,10,11,11,11,11
+energy_efficiency,10,11,11,11,12,12,12,12
+mergers,11,12,12,12,13,13,13,13
+has_net_metering,12,13,13,13,14,14,14,14
+non_net_metering_distributed,13,14,14,14,15,15,15,15
+operational_data,14,15,15,15,16,16,16,16
+reliability,15,16,16,16,17,17,17,17
+sales_to_ultimate_customers,16,17,17,17,18,18,18,18
+service_territory,17,18,18,18,19,19,19,19
+utility_data,18,19,19,19,20,20,20,20
+early_release,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/mergers_eia861.csv b/src/pudl/package_data/eia861/column_maps/mergers_eia861.csv
index 83132e379c..210968c091 100644
--- a/src/pudl/package_data/eia861/column_maps/mergers_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/mergers_eia861.csv
@@ -1,15 +1,15 @@
-year_index,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-state,3,3,3,3,3,3,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-entity_type,4,4,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-merge_date,5,5,5,5,5,4,3,3,3,3,3,3,3,3,3,3
-merge_company,6,6,6,6,6,5,4,4,4,4,4,4,4,4,4,4
-new_parent,7,7,7,7,7,6,5,5,5,5,5,5,5,5,5,5
-merge_address,8,8,8,8,8,7,6,6,6,6,6,6,6,6,6,6
-merge_city,9,9,9,9,9,8,7,7,7,7,7,7,7,7,7,7
-merge_state,10,10,10,10,10,9,8,8,8,8,8,8,8,8,8,8
-zip_code,11,11,11,11,11,10,9,9,9,9,9,9,9,9,9,9
-zip_code_4,12,12,12,12,12,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+state,3,3,3,3,3,3,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+entity_type,4,4,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+merge_date,5,5,5,5,5,4,3,3,3,3,3,3,3,3,3,3,3
+merge_company,6,6,6,6,6,5,4,4,4,4,4,4,4,4,4,4,4
+new_parent,7,7,7,7,7,6,5,5,5,5,5,5,5,5,5,5,5
+merge_address,8,8,8,8,8,7,6,6,6,6,6,6,6,6,6,6,6
+merge_city,9,9,9,9,9,8,7,7,7,7,7,7,7,7,7,7,7
+merge_state,10,10,10,10,10,9,8,8,8,8,8,8,8,8,8,8,8
+zip_code,11,11,11,11,11,10,9,9,9,9,9,9,9,9,9,9,9
+zip_code_4,12,12,12,12,12,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/net_metering_eia861.csv b/src/pudl/package_data/eia861/column_maps/net_metering_eia861.csv
index b05294fc43..0b177cb0ca 100644
--- a/src/pudl/package_data/eia861/column_maps/net_metering_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/net_metering_eia861.csv
@@ -1,104 +1,144 @@
-year_index,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2
-utility_name_eia,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3
-short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1
-state,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1
-residential_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,4,4,14,14,14,14,35,36,36,37,36,36,36
-commercial_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,5,5,15,15,15,15,36,37,37,38,37,37,37
-industrial_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,6,6,16,16,16,16,37,38,38,39,38,38,38
-transportation_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,7,7,17,17,17,17,38,39,39,40,39,39,39
-total_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,8,8,18,18,18,18,39,40,40,41,40,40,40
-residential_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,9,9,4,4,4,4,5,6,6,7,6,6,6
-commercial_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,10,10,5,5,5,5,6,7,7,8,7,7,7
-industrial_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,11,11,6,6,6,6,7,8,8,9,8,8,8
-transportation_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,12,12,7,7,7,7,8,9,9,10,9,9,9
-total_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,13,13,8,8,8,8,9,10,10,11,10,10,10
-residential_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,14,14,9,9,9,9,10,11,11,12,11,11,11
-commercial_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,15,15,10,10,10,10,11,12,12,13,12,12,12
-industrial_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,16,16,11,11,11,11,12,13,13,14,13,13,13
-transportation_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,17,17,12,12,12,12,13,14,14,15,14,14,14
-total_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,18,18,13,13,13,13,14,15,15,16,15,15,15
-residential_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,19,19,29,29,29,29,50,51,51,52,51,51,51
-commercial_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,20,20,30,30,30,30,51,52,52,53,52,52,52
-industrial_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,21,21,31,31,31,31,52,53,53,54,53,53,53
-transportation_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,22,22,32,32,32,32,53,54,54,55,54,54,54
-total_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,23,23,33,33,33,33,54,55,55,56,55,55,55
-residential_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,24,24,19,19,19,19,40,41,41,42,41,41,41
-commercial_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,25,25,20,20,20,20,41,42,42,43,42,42,42
-industrial_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,26,26,21,21,21,21,42,43,43,44,43,43,43
-transportation_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,27,27,22,22,22,22,43,44,44,45,44,44,44
-total_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,28,28,23,23,23,23,44,45,45,46,45,45,45
-residential_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,29,29,24,24,24,24,45,46,46,47,46,46,46
-commercial_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,30,30,25,25,25,25,46,47,47,48,47,47,47
-industrial_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,31,31,26,26,26,26,47,48,48,49,48,48,48
-transportation_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,32,32,27,27,27,27,48,49,49,50,49,49,49
-total_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,33,33,28,28,28,28,49,50,50,51,50,50,50
-residential_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,34,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-commercial_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,35,35,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-industrial_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,36,36,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-transportation_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,37,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-total_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,38,38,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-residential_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,39,39,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-commercial_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,40,40,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-industrial_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,41,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-transportation_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,42,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-total_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,43,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-residential_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,44,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-commercial_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,45,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-industrial_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,46,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-transportation_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,47,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-total_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,48,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-residential_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,49,49,44,44,44,44,65,66,66,67,66,66,66
-commercial_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,50,50,45,45,45,45,66,67,67,68,67,67,67
-industrial_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,51,51,46,46,46,46,67,68,68,69,68,68,68
-transportation_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,52,52,47,47,47,47,68,69,69,70,69,69,69
-total_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,53,53,48,48,48,48,69,70,70,71,70,70,70
-residential_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,54,54,34,34,34,34,55,56,56,57,56,56,56
-commercial_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,55,55,35,35,35,35,56,57,57,58,57,57,57
-industrial_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,56,56,36,36,36,36,57,58,58,59,58,58,58
-transportation_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,57,57,37,37,37,37,58,59,59,60,59,59,59
-total_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,58,58,38,38,38,38,59,60,60,61,60,60,60
-residential_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,59,59,39,39,39,39,60,61,61,62,61,61,61
-commercial_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,60,60,40,40,40,40,61,62,62,63,62,62,62
-industrial_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,61,61,41,41,41,41,62,63,63,64,63,63,63
-transportation_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,62,62,42,42,42,42,63,64,64,65,64,64,64
-total_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,63,63,43,43,43,43,64,65,65,66,65,65,65
-residential_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,9,9,9,64,64,59,59,59,59,80,81,81,82,81,81,81
-commercial_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,10,10,10,65,65,60,60,60,60,81,82,82,83,82,82,82
-industrial_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,11,11,11,66,66,61,61,61,61,82,83,83,84,83,83,83
-transportation_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,12,12,12,67,67,62,62,62,62,83,84,84,85,84,84,84
-total_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,13,13,13,68,68,63,63,63,63,84,85,85,86,85,85,85
-residential_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,69,69,49,49,49,49,70,71,71,72,71,71,71
-commercial_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,70,70,50,50,50,50,71,72,72,73,72,72,72
-industrial_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,71,71,51,51,51,51,72,73,73,74,73,73,73
-transportation_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,72,72,52,52,52,52,73,74,74,75,74,74,74
-total_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,73,73,53,53,53,53,74,75,75,76,75,75,75
-residential_total_customers,4,4,4,4,4,4,4,4,74,74,54,54,54,54,75,76,76,77,76,76,76
-commercial_total_customers,5,5,5,5,5,5,5,5,75,75,55,55,55,55,76,77,77,78,77,77,77
-industrial_total_customers,6,6,6,6,6,6,6,6,76,76,56,56,56,56,77,78,78,79,78,78,78
-transportation_total_customers,7,7,7,7,7,7,7,7,77,77,57,57,57,57,78,79,79,80,79,79,79
-total_total_customers,8,8,8,8,8,8,8,8,78,78,58,58,58,58,79,80,80,81,80,80,80
-pv_current_flow_type,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,5,5,6,5,5,5
-balancing_authority_code_eia,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,5,4,4,4
-residential_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,15,16,16,17,16,16,16
-commercial_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16,17,17,18,17,17,17
-industrial_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,17,18,18,19,18,18,18
-transportation_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,18,19,19,20,19,19,19
-total_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,20,20,21,20,20,20
-residential_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,21,21,22,21,21,21
-commercial_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,21,22,22,23,22,22,22
-industrial_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,22,23,23,24,23,23,23
-transportation_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,23,24,24,25,24,24,24
-total_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,24,25,25,26,25,25,25
-residential_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,25,26,26,27,26,26,26
-commercial_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,27,27,28,27,27,27
-industrial_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27,28,28,29,28,28,28
-transportation_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,28,29,29,30,29,29,29
-total_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,29,30,30,31,30,30,30
-residential_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,30,31,31,32,31,31,31
-commercial_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,31,32,32,33,32,32,32
-industrial_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,32,33,33,34,33,33,33
-transportation_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,34,34,35,34,34,34
-total_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,34,35,35,36,35,35,35
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2
+utility_name_eia,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3
+short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1
+state,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1
+residential_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,4,4,14,14,14,14,35,36,36,37,36,36,36,16
+commercial_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,5,5,15,15,15,15,36,37,37,38,37,37,37,17
+industrial_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,6,6,16,16,16,16,37,38,38,39,38,38,38,18
+transportation_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,7,7,17,17,17,17,38,39,39,40,39,39,39,19
+total_pv_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,8,8,18,18,18,18,39,40,40,41,40,40,40,20
+residential_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,9,9,4,4,4,4,5,6,6,7,6,6,6,6
+commercial_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,10,10,5,5,5,5,6,7,7,8,7,7,7,7
+industrial_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,11,11,6,6,6,6,7,8,8,9,8,8,8,8
+transportation_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,12,12,7,7,7,7,8,9,9,10,9,9,9,9
+total_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,13,13,8,8,8,8,9,10,10,11,10,10,10,10
+residential_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,14,14,9,9,9,9,10,11,11,12,11,11,11,11
+commercial_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,15,15,10,10,10,10,11,12,12,13,12,12,12,12
+industrial_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,16,16,11,11,11,11,12,13,13,14,13,13,13,13
+transportation_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,17,17,12,12,12,12,13,14,14,15,14,14,14,14
+total_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,18,18,13,13,13,13,14,15,15,16,15,15,15,15
+residential_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,19,19,29,29,29,29,50,51,51,52,51,51,51,81
+commercial_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,20,20,30,30,30,30,51,52,52,53,52,52,52,82
+industrial_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,21,21,31,31,31,31,52,53,53,54,53,53,53,83
+transportation_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,22,22,32,32,32,32,53,54,54,55,54,54,54,84
+total_wind_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,23,23,33,33,33,33,54,55,55,56,55,55,55,85
+residential_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,24,24,19,19,19,19,40,41,41,42,41,41,41,71
+commercial_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,25,25,20,20,20,20,41,42,42,43,42,42,42,72
+industrial_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,26,26,21,21,21,21,42,43,43,44,43,43,43,73
+transportation_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,27,27,22,22,22,22,43,44,44,45,44,44,44,74
+total_wind_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,28,28,23,23,23,23,44,45,45,46,45,45,45,75
+residential_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,29,29,24,24,24,24,45,46,46,47,46,46,46,76
+commercial_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,30,30,25,25,25,25,46,47,47,48,47,47,47,77
+industrial_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,31,31,26,26,26,26,47,48,48,49,48,48,48,78
+transportation_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,32,32,27,27,27,27,48,49,49,50,49,49,49,79
+total_wind_customers,-1,-1,-1,-1,-1,-1,-1,-1,33,33,28,28,28,28,49,50,50,51,50,50,50,80
+residential_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,34,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+commercial_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,35,35,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+industrial_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,36,36,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+transportation_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,37,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+total_chp_cogen_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,38,38,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+residential_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,39,39,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+commercial_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,40,40,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+industrial_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,41,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+transportation_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,42,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+total_chp_cogen_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,43,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+residential_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,44,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+commercial_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,45,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+industrial_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,46,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+transportation_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,47,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+total_chp_cogen_customers,-1,-1,-1,-1,-1,-1,-1,-1,48,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+residential_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,49,49,44,44,44,44,65,66,66,67,66,66,66,96
+commercial_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,50,50,45,45,45,45,66,67,67,68,67,67,67,97
+industrial_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,51,51,46,46,46,46,67,68,68,69,68,68,68,98
+transportation_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,52,52,47,47,47,47,68,69,69,70,69,69,69,99
+total_other_sold_to_utility_mwh,-1,-1,-1,-1,-1,-1,-1,-1,53,53,48,48,48,48,69,70,70,71,70,70,70,100
+residential_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,54,54,34,34,34,34,55,56,56,57,56,56,56,86
+commercial_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,55,55,35,35,35,35,56,57,57,58,57,57,57,87
+industrial_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,56,56,36,36,36,36,57,58,58,59,58,58,58,88
+transportation_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,57,57,37,37,37,37,58,59,59,60,59,59,59,89
+total_other_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,58,58,38,38,38,38,59,60,60,61,60,60,60,90
+residential_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,59,59,39,39,39,39,60,61,61,62,61,61,61,91
+commercial_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,60,60,40,40,40,40,61,62,62,63,62,62,62,92
+industrial_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,61,61,41,41,41,41,62,63,63,64,63,63,63,93
+transportation_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,62,62,42,42,42,42,63,64,64,65,64,64,64,94
+total_other_customers,-1,-1,-1,-1,-1,-1,-1,-1,63,63,43,43,43,43,64,65,65,66,65,65,65,95
+residential_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,9,9,9,64,64,59,59,59,59,80,81,81,82,81,81,81,111
+commercial_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,10,10,10,65,65,60,60,60,60,81,82,82,83,82,82,82,112
+industrial_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,11,11,11,66,66,61,61,61,61,82,83,83,84,83,83,83,113
+transportation_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,12,12,12,67,67,62,62,62,62,83,84,84,85,84,84,84,114
+total_total_sold_to_utility_mwh,-1,-1,-1,-1,-1,13,13,13,68,68,63,63,63,63,84,85,85,86,85,85,85,115
+residential_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,69,69,49,49,49,49,70,71,71,72,71,71,71,101
+commercial_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,70,70,50,50,50,50,71,72,72,73,72,72,72,102
+industrial_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,71,71,51,51,51,51,72,73,73,74,73,73,73,103
+transportation_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,72,72,52,52,52,52,73,74,74,75,74,74,74,104
+total_total_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,73,73,53,53,53,53,74,75,75,76,75,75,75,105
+residential_total_customers,4,4,4,4,4,4,4,4,74,74,54,54,54,54,75,76,76,77,76,76,76,106
+commercial_total_customers,5,5,5,5,5,5,5,5,75,75,55,55,55,55,76,77,77,78,77,77,77,107
+industrial_total_customers,6,6,6,6,6,6,6,6,76,76,56,56,56,56,77,78,78,79,78,78,78,108
+transportation_total_customers,7,7,7,7,7,7,7,7,77,77,57,57,57,57,78,79,79,80,79,79,79,109
+total_total_customers,8,8,8,8,8,8,8,8,78,78,58,58,58,58,79,80,80,81,80,80,80,110
+pv_current_flow_type,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,5,5,6,5,5,5,5
+balancing_authority_code_eia,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,5,4,4,4,4
+residential_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,15,16,16,17,16,16,16,41
+commercial_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,16,17,17,18,17,17,17,42
+industrial_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,17,18,18,19,18,18,18,43
+transportation_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,18,19,19,20,19,19,19,44
+total_storage_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,20,20,21,20,20,20,45
+residential_storage_pv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51
+commercial_storage_pv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52
+industrial_storage_pv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53
+transportation_storage_pv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,54
+total_storage_pv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55
+residential_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,21,21,22,21,21,21,46
+commercial_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,21,22,22,23,22,22,22,47
+industrial_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,22,23,23,24,23,23,23,48
+transportation_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,23,24,24,25,24,24,24,49
+total_storage_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,24,25,25,26,25,25,25,50
+residential_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,25,26,26,27,26,26,26,-1
+commercial_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,27,27,28,27,27,27,-1
+industrial_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27,28,28,29,28,28,28,-1
+transportation_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,28,29,29,30,29,29,29,-1
+total_virtual_pv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,29,30,30,31,30,30,30,-1
+residential_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,30,31,31,32,31,31,31,-1
+commercial_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,31,32,32,33,32,32,32,-1
+industrial_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,32,33,33,34,33,33,33,-1
+transportation_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,34,34,35,34,34,34,-1
+total_virtual_pv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,34,35,35,36,35,35,35,-1
+residential_virtual_pv_under_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,31
+commercial_virtual_pv_under_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,32
+industrial_virtual_pv_under_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33
+transportation_virtual_pv_under_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,34
+total_virtual_pv_under_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,35
+residential_virtual_pv_under_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,36
+commercial_virtual_pv_under_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,37
+industrial_virtual_pv_under_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,38
+transportation_virtual_pv_under_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39
+total_virtual_pv_under_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,40
+residential_virtual_pv_over_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,21
+commercial_virtual_pv_over_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,22
+industrial_virtual_pv_over_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,23
+transportation_virtual_pv_over_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,24
+total_virtual_pv_over_1mw_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,25
+residential_virtual_pv_over_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26
+commercial_virtual_pv_over_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27
+industrial_virtual_pv_over_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,28
+transportation_virtual_pv_over_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,29
+total_virtual_pv_over_1mw_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,30
+residential_storage_nonpv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,56
+commercial_storage_nonpv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,57
+industrial_storage_nonpv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,58
+transportation_storage_nonpv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,59
+total_storage_nonpv_capacity_mw,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,60
+residential_storage_nonpv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,66
+commercial_storage_nonpv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,67
+industrial_storage_nonpv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,68
+transportation_storage_nonpv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,69
+total_storage_nonpv_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,70
+residential_storage_nonpv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,61
+commercial_storage_nonpv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62
+industrial_storage_nonpv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,63
+transportation_storage_nonpv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64
+total_storage_nonpv_customers,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,65
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/non_net_metering_eia861.csv b/src/pudl/package_data/eia861/column_maps/non_net_metering_eia861.csv
index 4dacfcd71e..bc54736c19 100644
--- a/src/pudl/package_data/eia861/column_maps/non_net_metering_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/non_net_metering_eia861.csv
@@ -1,72 +1,78 @@
-year_index,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0
-state,1,1,1,1,1,1,1
-utility_id_eia,2,2,2,2,2,2,2
-utility_name_eia,3,3,3,3,3,3,3
-balancing_authority_code_eia,4,4,4,4,4,4,4
-generators_number,5,5,5,5,5,5,5
-total_capacity_mw,6,6,6,6,6,6,6
-backup_capacity_mw,7,7,7,7,7,7,7
-utility_owned_capacity_mw,8,8,8,8,8,8,8
-pv_current_flow_type,9,9,9,9,9,9,9
-residential_pv_capacity_mw,10,10,10,10,10,10,10
-commercial_pv_capacity_mw,11,11,11,11,11,11,11
-industrial_pv_capacity_mw,12,12,12,12,12,12,12
-transportation_pv_capacity_mw,13,13,13,13,13,13,13
-direct_connection_pv_capacity_mw,14,14,14,14,14,14,14
-total_pv_capacity_mw,15,15,15,15,15,15,15
-residential_all_storage_capacity_mw,16,16,16,16,16,16,16
-commercial_all_storage_capacity_mw,17,17,17,17,17,17,17
-industrial_all_storage_capacity_mw,18,18,18,18,18,18,18
-transportation_all_storage_capacity_mw,19,19,19,19,19,19,19
-direct_connection_all_storage_capacity_mw,20,20,20,20,20,20,20
-total_all_storage_capacity_mw,21,21,21,21,21,21,21
-residential_wind_capacity_mw,22,22,22,22,22,22,22
-commercial_wind_capacity_mw,23,23,23,23,23,23,23
-industrial_wind_capacity_mw,24,24,24,24,24,24,24
-transportation_wind_capacity_mw,25,25,25,25,25,25,25
-direct_connection_wind_capacity_mw,26,26,26,26,26,26,26
-total_wind_capacity_mw,27,27,27,27,27,27,27
-residential_hydro_capacity_mw,28,28,28,28,28,28,28
-commercial_hydro_capacity_mw,29,29,29,29,29,29,29
-industrial_hydro_capacity_mw,30,30,30,30,30,30,30
-transportation_hydro_capacity_mw,31,31,31,31,31,31,31
-direct_connection_hydro_capacity_mw,32,32,32,32,32,32,32
-total_hydro_capacity_mw,33,33,33,33,33,33,33
-residential_fuel_cell_capacity_mw,34,34,34,34,34,34,34
-commercial_fuel_cell_capacity_mw,35,35,35,35,35,35,35
-industrial_fuel_cell_capacity_mw,36,36,36,36,36,36,36
-transportation_fuel_cell_capacity_mw,37,37,37,37,37,37,37
-direct_connection_fuel_cell_capacity_mw,38,38,38,38,38,38,38
-total_fuel_cell_capacity_mw,39,39,39,39,39,39,39
-residential_internal_combustion_capacity_mw,40,40,40,40,40,40,40
-commercial_internal_combustion_capacity_mw,41,41,41,41,41,41,41
-industrial_internal_combustion_capacity_mw,42,42,42,42,42,42,42
-transportation_internal_combustion_capacity_mw,43,43,43,43,43,43,43
-direct_connection_internal_combustion_capacity_mw,44,44,44,44,44,44,44
-total_internal_combustion_capacity_mw,45,45,45,45,45,45,45
-residential_combustion_turbine_capacity_mw,46,46,46,46,46,46,46
-commercial_combustion_turbine_capacity_mw,47,47,47,47,47,47,47
-industrial_combustion_turbine_capacity_mw,48,48,48,48,48,48,48
-transportation_combustion_turbine_capacity_mw,49,49,49,49,49,49,49
-direct_connection_combustion_turbine_capacity_mw,50,50,50,50,50,50,50
-total_combustion_turbine_capacity_mw,51,51,51,51,51,51,51
-residential_steam_capacity_mw,52,52,52,52,52,52,52
-commercial_steam_capacity_mw,53,53,53,53,53,53,53
-industrial_steam_capacity_mw,54,54,54,54,54,54,54
-transportation_steam_capacity_mw,55,55,55,55,55,55,55
-direct_connection_steam_capacity_mw,56,56,56,56,56,56,56
-total_steam_capacity_mw,57,57,57,57,57,57,57
-residential_other_capacity_mw,58,58,58,58,58,58,58
-commercial_other_capacity_mw,59,59,59,59,59,59,59
-industrial_other_capacity_mw,60,60,60,60,60,60,60
-transportation_other_capacity_mw,61,61,61,61,61,61,61
-direct_connection_other_capacity_mw,62,62,62,62,62,62,62
-total_other_capacity_mw,63,63,63,63,63,63,63
-residential_total_capacity_mw,64,64,64,64,64,64,64
-commercial_total_capacity_mw,65,65,65,65,65,65,65
-industrial_total_capacity_mw,66,66,66,66,66,66,66
-transportation_total_capacity_mw,67,67,67,67,67,67,67
-direct_connection_total_capacity_mw,68,68,68,68,68,68,68
-total_total_capacity_mw,69,69,69,69,69,69,69
-early_release,-1,-1,-1,-1,-1,-1,-1
+year_index,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0
+state,1,1,1,1,1,1,1,1
+utility_id_eia,2,2,2,2,2,2,2,2
+utility_name_eia,3,3,3,3,3,3,3,3
+balancing_authority_code_eia,4,4,4,4,4,4,4,4
+generators_number,5,5,5,5,5,5,5,5
+total_capacity_mw,6,6,6,6,6,6,6,6
+backup_capacity_mw,7,7,7,7,7,7,7,7
+utility_owned_capacity_mw,8,8,8,8,8,8,8,8
+pv_current_flow_type,9,9,9,9,9,9,9,9
+residential_pv_capacity_mw,10,10,10,10,10,10,10,10
+commercial_pv_capacity_mw,11,11,11,11,11,11,11,11
+industrial_pv_capacity_mw,12,12,12,12,12,12,12,12
+transportation_pv_capacity_mw,13,13,13,13,13,13,13,13
+direct_connection_pv_capacity_mw,14,14,14,14,14,14,14,14
+total_pv_capacity_mw,15,15,15,15,15,15,15,15
+residential_all_storage_capacity_mw,16,16,16,16,16,16,16,16
+commercial_all_storage_capacity_mw,17,17,17,17,17,17,17,17
+industrial_all_storage_capacity_mw,18,18,18,18,18,18,18,18
+transportation_all_storage_capacity_mw,19,19,19,19,19,19,19,19
+direct_connection_all_storage_capacity_mw,20,20,20,20,20,20,20,20
+total_all_storage_capacity_mw,21,21,21,21,21,21,21,21
+residential_all_storage_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,22
+commercial_all_storage_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,23
+industrial_all_storage_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,24
+transportation_all_storage_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,25
+direct_connection_all_storage_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,26
+total_all_storage_energy_capacity_mwh,-1,-1,-1,-1,-1,-1,-1,27
+residential_wind_capacity_mw,22,22,22,22,22,22,22,28
+commercial_wind_capacity_mw,23,23,23,23,23,23,23,29
+industrial_wind_capacity_mw,24,24,24,24,24,24,24,30
+transportation_wind_capacity_mw,25,25,25,25,25,25,25,31
+direct_connection_wind_capacity_mw,26,26,26,26,26,26,26,32
+total_wind_capacity_mw,27,27,27,27,27,27,27,33
+residential_hydro_capacity_mw,28,28,28,28,28,28,28,34
+commercial_hydro_capacity_mw,29,29,29,29,29,29,29,35
+industrial_hydro_capacity_mw,30,30,30,30,30,30,30,36
+transportation_hydro_capacity_mw,31,31,31,31,31,31,31,37
+direct_connection_hydro_capacity_mw,32,32,32,32,32,32,32,38
+total_hydro_capacity_mw,33,33,33,33,33,33,33,39
+residential_fuel_cell_capacity_mw,34,34,34,34,34,34,34,40
+commercial_fuel_cell_capacity_mw,35,35,35,35,35,35,35,41
+industrial_fuel_cell_capacity_mw,36,36,36,36,36,36,36,42
+transportation_fuel_cell_capacity_mw,37,37,37,37,37,37,37,43
+direct_connection_fuel_cell_capacity_mw,38,38,38,38,38,38,38,44
+total_fuel_cell_capacity_mw,39,39,39,39,39,39,39,45
+residential_internal_combustion_capacity_mw,40,40,40,40,40,40,40,46
+commercial_internal_combustion_capacity_mw,41,41,41,41,41,41,41,47
+industrial_internal_combustion_capacity_mw,42,42,42,42,42,42,42,48
+transportation_internal_combustion_capacity_mw,43,43,43,43,43,43,43,49
+direct_connection_internal_combustion_capacity_mw,44,44,44,44,44,44,44,50
+total_internal_combustion_capacity_mw,45,45,45,45,45,45,45,51
+residential_combustion_turbine_capacity_mw,46,46,46,46,46,46,46,52
+commercial_combustion_turbine_capacity_mw,47,47,47,47,47,47,47,53
+industrial_combustion_turbine_capacity_mw,48,48,48,48,48,48,48,54
+transportation_combustion_turbine_capacity_mw,49,49,49,49,49,49,49,55
+direct_connection_combustion_turbine_capacity_mw,50,50,50,50,50,50,50,56
+total_combustion_turbine_capacity_mw,51,51,51,51,51,51,51,57
+residential_steam_capacity_mw,52,52,52,52,52,52,52,58
+commercial_steam_capacity_mw,53,53,53,53,53,53,53,59
+industrial_steam_capacity_mw,54,54,54,54,54,54,54,60
+transportation_steam_capacity_mw,55,55,55,55,55,55,55,61
+direct_connection_steam_capacity_mw,56,56,56,56,56,56,56,62
+total_steam_capacity_mw,57,57,57,57,57,57,57,63
+residential_other_capacity_mw,58,58,58,58,58,58,58,64
+commercial_other_capacity_mw,59,59,59,59,59,59,59,65
+industrial_other_capacity_mw,60,60,60,60,60,60,60,66
+transportation_other_capacity_mw,61,61,61,61,61,61,61,67
+direct_connection_other_capacity_mw,62,62,62,62,62,62,62,68
+total_other_capacity_mw,63,63,63,63,63,63,63,69
+residential_total_capacity_mw,64,64,64,64,64,64,64,70
+commercial_total_capacity_mw,65,65,65,65,65,65,65,71
+industrial_total_capacity_mw,66,66,66,66,66,66,66,72
+transportation_total_capacity_mw,67,67,67,67,67,67,67,73
+direct_connection_total_capacity_mw,68,68,68,68,68,68,68,74
+total_total_capacity_mw,69,69,69,69,69,69,69,75
+early_release,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/operational_data_eia861.csv b/src/pudl/package_data/eia861/column_maps/operational_data_eia861.csv
index 099bd90411..80cc26eaad 100644
--- a/src/pudl/package_data/eia861/column_maps/operational_data_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/operational_data_eia861.csv
@@ -1,37 +1,37 @@
-year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,-1,-1,-1
-state,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3,3
-entity_type,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,5,4,4,4
-nerc_region,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,6,5,5,5
-summer_peak_demand_mw,34,34,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,7,6,6,6
-winter_peak_demand_mw,35,35,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,8,7,7,7
-net_generation_mwh,40,38,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,9,8,8,8
-wholesale_power_purchases_mwh,-1,-1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,10,9,9,9
-exchange_energy_received_mwh,44,40,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,11,10,10,10
-exchange_energy_delivered_mwh,45,41,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,12,11,11,11
-net_power_exchanged_mwh,46,42,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13,12,12,12
-wheeled_power_received_mwh,47,43,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,14,13,13,13
-wheeled_power_delivered_mwh,48,43,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,15,14,14,14
-net_wheeled_power_mwh,49,43,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,16,15,15,15
-transmission_by_other_losses_mwh,50,46,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,16,16,16
-total_sources_mwh,51,47,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,17,17,17
-retail_sales_mwh,52,48,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,19,18,18,18
-sales_for_resale_mwh,53,49,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,20,19,19,19
-furnished_without_charge_mwh,55,50,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,21,20,20,20
-consumed_by_respondent_without_charge_mwh,-1,-1,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,22,21,21,21
-consumed_by_facility_mwh,-1,-1,22,22,22,22,22,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-total_energy_losses_mwh,57,52,23,23,23,23,23,22,22,22,22,22,22,22,22,22,22,22,22,22,23,22,22,22
-total_disposition_mwh,58,53,24,24,24,24,24,23,23,23,23,23,23,23,23,23,23,23,23,23,24,23,23,23
-retail_sales_revenue,59,54,25,25,25,25,25,24,24,24,24,24,24,24,24,24,24,24,24,24,25,24,24,24
-unbundled_revenue,-1,-1,-1,-1,-1,-1,-1,-1,25,25,25,25,25,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-delivery_customers_revenue,-1,-1,26,26,26,26,26,25,-1,-1,-1,-1,-1,25,25,25,25,25,25,25,26,25,25,25
-sales_for_resale_revenue,60,55,27,27,27,27,27,26,26,26,26,26,26,26,26,26,26,26,26,26,27,26,26,26
-credits_or_adjustments_revenue,61,56,28,28,28,28,28,27,27,27,27,27,27,27,27,27,27,27,27,27,28,27,27,27
-transmission_revenue,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,28,28,28,28,28,28,28,28,28,29,28,28,28
-other_revenue,62,57,29,29,29,29,29,28,28,28,28,29,29,29,29,29,29,29,29,29,30,29,29,29
-total_revenue,63,58,30,30,30,30,30,29,29,29,29,30,30,30,30,30,30,30,30,30,31,30,30,30
-data_observed,-1,-1,31,31,31,31,31,30,30,30,30,31,31,31,31,31,31,31,31,31,32,31,31,31
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,-1,-1,-1,-1
+state,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3,3,3
+entity_type,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,5,4,4,4,4
+nerc_region,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,6,5,5,5,5
+summer_peak_demand_mw,34,34,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,7,6,6,6,6
+winter_peak_demand_mw,35,35,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,8,7,7,7,7
+net_generation_mwh,40,38,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,9,8,8,8,8
+wholesale_power_purchases_mwh,-1,-1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,10,9,9,9,9
+exchange_energy_received_mwh,44,40,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,11,10,10,10,10
+exchange_energy_delivered_mwh,45,41,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,12,11,11,11,11
+net_power_exchanged_mwh,46,42,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13,12,12,12,12
+wheeled_power_received_mwh,47,43,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,14,13,13,13,13
+wheeled_power_delivered_mwh,48,43,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,15,14,14,14,14
+net_wheeled_power_mwh,49,43,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,16,15,15,15,15
+transmission_by_other_losses_mwh,50,46,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,16,16,16,16
+total_sources_mwh,51,47,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,17,17,17,17
+retail_sales_mwh,52,48,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,19,18,18,18,18
+sales_for_resale_mwh,53,49,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,20,19,19,19,19
+furnished_without_charge_mwh,55,50,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,21,20,20,20,20
+consumed_by_respondent_without_charge_mwh,-1,-1,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,22,21,21,21,21
+consumed_by_facility_mwh,-1,-1,22,22,22,22,22,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+total_energy_losses_mwh,57,52,23,23,23,23,23,22,22,22,22,22,22,22,22,22,22,22,22,22,23,22,22,22,22
+total_disposition_mwh,58,53,24,24,24,24,24,23,23,23,23,23,23,23,23,23,23,23,23,23,24,23,23,23,23
+retail_sales_revenue,59,54,25,25,25,25,25,24,24,24,24,24,24,24,24,24,24,24,24,24,25,24,24,24,24
+unbundled_revenue,-1,-1,-1,-1,-1,-1,-1,-1,25,25,25,25,25,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+delivery_customers_revenue,-1,-1,26,26,26,26,26,25,-1,-1,-1,-1,-1,25,25,25,25,25,25,25,26,25,25,25,25
+sales_for_resale_revenue,60,55,27,27,27,27,27,26,26,26,26,26,26,26,26,26,26,26,26,26,27,26,26,26,26
+credits_or_adjustments_revenue,61,56,28,28,28,28,28,27,27,27,27,27,27,27,27,27,27,27,27,27,28,27,27,27,27
+transmission_revenue,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,28,28,28,28,28,28,28,28,28,29,28,28,28,28
+other_revenue,62,57,29,29,29,29,29,28,28,28,28,29,29,29,29,29,29,29,29,29,30,29,29,29,29
+total_revenue,63,58,30,30,30,30,30,29,29,29,29,30,30,30,30,30,30,30,30,30,31,30,30,30,30
+data_observed,-1,-1,31,31,31,31,31,30,30,30,30,31,31,31,31,31,31,31,31,31,32,31,31,31,31
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/reliability_eia861.csv b/src/pudl/package_data/eia861/column_maps/reliability_eia861.csv
index f12730653c..c177ca04c9 100644
--- a/src/pudl/package_data/eia861/column_maps/reliability_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/reliability_eia861.csv
@@ -1,31 +1,31 @@
-year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2,2,2,2
-state,3,3,3,3,3,3,3,3,3,3
-entity_type,4,4,4,4,4,4,4,4,4,4
-short_form,-1,-1,-1,-1,-1,-1,5,-1,-1,-1
-ieee_standard_saidi_w_major_event_days_minutes,5,5,5,5,5,5,6,5,5,5
-ieee_standard_saidi_wo_major_event_days_minutes,8,8,8,8,8,8,9,8,8,8
-ieee_standard_saidi_w_major_event_days_minus_loss_of_service_minutes,11,11,11,11,11,11,12,11,11,11
-ieee_standard_saifi_w_major_event_days_customers,6,6,6,6,6,6,7,6,6,6
-ieee_standard_caidi_w_major_event_days_minutes,7,7,7,7,7,7,8,7,7,7
-ieee_standard_saifi_wo_major_event_days_customers,9,9,9,9,9,9,10,9,9,9
-ieee_standard_caidi_wo_major_event_days_minutes,10,10,10,10,10,10,11,10,10,10
-ieee_standard_saifi_w_major_event_days_minus_loss_of_service_customers,12,12,12,12,12,12,13,12,12,12
-ieee_standard_caidi_w_major_event_days_minus_loss_of_service_minutes,13,13,13,13,13,13,14,13,13,13
-ieee_standard_customers,14,14,14,14,14,14,15,14,14,14
-ieee_standard_highest_distribution_voltage_kv,15,15,15,15,15,15,16,15,15,15
-ieee_standard_outages_recorded_automatically,16,16,16,16,16,16,17,16,16,16
-other_standard_saidi_w_major_event_days_minutes,17,17,17,17,17,17,18,17,17,17
-other_standard_saidi_wo_major_event_days_minutes,20,20,20,20,20,20,21,20,20,20
-other_standard_saifi_w_major_event_days_customers,18,18,18,18,18,18,19,18,18,18
-other_standard_caidi_w_major_event_days_minutes,19,19,19,19,19,19,20,19,19,19
-other_standard_saifi_wo_major_event_days_customers,21,21,21,21,21,21,22,21,21,21
-other_standard_caidi_wo_major_event_days_minutes,22,22,22,22,22,22,23,22,22,22
-other_standard_customers,23,23,23,23,23,23,24,23,23,23
-other_standard_inactive_accounts_included,24,24,24,24,24,24,25,24,24,24
-other_standard_momentary_interruption_definition,25,25,25,25,25,25,26,25,25,25
-other_standard_highest_distribution_voltage_kv,26,26,26,26,26,26,27,26,26,26
-other_standard_outages_recorded_automatically,27,27,27,27,27,27,28,27,27,27
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,2,2,2,2
+state,3,3,3,3,3,3,3,3,3,3,3
+entity_type,4,4,4,4,4,4,4,4,4,4,4
+short_form,-1,-1,-1,-1,-1,-1,5,-1,-1,-1,-1
+ieee_standard_saidi_w_major_event_days_minutes,5,5,5,5,5,5,6,5,5,5,5
+ieee_standard_saidi_wo_major_event_days_minutes,8,8,8,8,8,8,9,8,8,8,8
+ieee_standard_saidi_w_major_event_days_minus_loss_of_service_minutes,11,11,11,11,11,11,12,11,11,11,11
+ieee_standard_saifi_w_major_event_days_customers,6,6,6,6,6,6,7,6,6,6,6
+ieee_standard_caidi_w_major_event_days_minutes,7,7,7,7,7,7,8,7,7,7,7
+ieee_standard_saifi_wo_major_event_days_customers,9,9,9,9,9,9,10,9,9,9,9
+ieee_standard_caidi_wo_major_event_days_minutes,10,10,10,10,10,10,11,10,10,10,10
+ieee_standard_saifi_w_major_event_days_minus_loss_of_service_customers,12,12,12,12,12,12,13,12,12,12,12
+ieee_standard_caidi_w_major_event_days_minus_loss_of_service_minutes,13,13,13,13,13,13,14,13,13,13,13
+ieee_standard_customers,14,14,14,14,14,14,15,14,14,14,14
+ieee_standard_highest_distribution_voltage_kv,15,15,15,15,15,15,16,15,15,15,15
+ieee_standard_outages_recorded_automatically,16,16,16,16,16,16,17,16,16,16,16
+other_standard_saidi_w_major_event_days_minutes,17,17,17,17,17,17,18,17,17,17,17
+other_standard_saidi_wo_major_event_days_minutes,20,20,20,20,20,20,21,20,20,20,20
+other_standard_saifi_w_major_event_days_customers,18,18,18,18,18,18,19,18,18,18,18
+other_standard_caidi_w_major_event_days_minutes,19,19,19,19,19,19,20,19,19,19,19
+other_standard_saifi_wo_major_event_days_customers,21,21,21,21,21,21,22,21,21,21,21
+other_standard_caidi_wo_major_event_days_minutes,22,22,22,22,22,22,23,22,22,22,22
+other_standard_customers,23,23,23,23,23,23,24,23,23,23,23
+other_standard_inactive_accounts_included,24,24,24,24,24,24,25,24,24,24,24
+other_standard_momentary_interruption_definition,25,25,25,25,25,25,26,25,25,25,25
+other_standard_highest_distribution_voltage_kv,26,26,26,26,26,26,27,26,26,26,26
+other_standard_outages_recorded_automatically,27,27,27,27,27,27,28,27,27,27,27
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/sales_eia861.csv b/src/pudl/package_data/eia861/column_maps/sales_eia861.csv
index ed5d92e221..bd5661d1ea 100644
--- a/src/pudl/package_data/eia861/column_maps/sales_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/sales_eia861.csv
@@ -1,30 +1,30 @@
-year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-business_model,-1,-1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
-service_type,-1,-1,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
-data_observed,-1,-1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-state,2,2,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6
-entity_type,-1,-1,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
-balancing_authority_code_eia,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8,8,8,8,8,8,8,8,8,8
-short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9,-1,-1,-1
-residential_sales_revenue,3,3,8,8,8,8,8,8,8,8,8,8,8,8,9,9,9,9,9,9,10,9,9,9
-residential_sales_mwh,4,4,9,9,9,9,9,9,9,9,9,9,9,9,10,10,10,10,10,10,11,10,10,10
-residential_customers,5,5,10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,12,11,11,11
-commercial_sales_revenue,6,6,11,11,11,11,11,11,11,11,11,11,11,11,12,12,12,12,12,12,13,12,12,12
-commercial_sales_mwh,7,7,12,12,12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,14,13,13,13
-commercial_customers,8,8,13,13,13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,14,15,14,14,14
-industrial_sales_revenue,9,9,14,14,14,14,14,14,14,14,14,14,14,14,15,15,15,15,15,15,16,15,15,15
-industrial_sales_mwh,10,10,15,15,15,15,15,15,15,15,15,15,15,15,16,16,16,16,16,16,17,16,16,16
-industrial_customers,11,11,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,17,17,17,18,17,17,17
-transportation_sales_revenue,12,12,17,17,17,17,17,17,17,17,17,17,17,17,18,18,18,18,18,18,19,18,18,18
-transportation_sales_mwh,13,13,18,18,18,18,18,18,18,18,18,18,18,18,19,19,19,19,19,19,20,19,19,19
-transportation_customers,14,14,19,19,19,19,19,19,19,19,19,19,19,19,20,20,20,20,20,20,21,20,20,20
-other_sales_revenue,15,15,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-other_sales_mwh,16,16,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-other_customers,17,17,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-total_sales_revenue,18,18,20,20,20,20,20,20,20,20,20,20,20,20,21,21,21,21,21,21,22,21,21,21
-total_sales_mwh,19,19,21,21,21,21,21,21,21,21,21,21,21,21,22,22,22,22,22,22,23,22,22,22
-total_customers,20,20,22,22,22,22,22,22,22,22,22,22,22,22,23,23,23,23,23,23,24,23,23,23
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+business_model,-1,-1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+service_type,-1,-1,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
+data_observed,-1,-1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+state,2,2,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6
+entity_type,-1,-1,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
+balancing_authority_code_eia,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8,8,8,8,8,8,8,8,8,8,8
+short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9,-1,-1,-1,-1
+residential_sales_revenue,3,3,8,8,8,8,8,8,8,8,8,8,8,8,9,9,9,9,9,9,10,9,9,9,9
+residential_sales_mwh,4,4,9,9,9,9,9,9,9,9,9,9,9,9,10,10,10,10,10,10,11,10,10,10,10
+residential_customers,5,5,10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,12,11,11,11,11
+commercial_sales_revenue,6,6,11,11,11,11,11,11,11,11,11,11,11,11,12,12,12,12,12,12,13,12,12,12,12
+commercial_sales_mwh,7,7,12,12,12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,14,13,13,13,13
+commercial_customers,8,8,13,13,13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,14,15,14,14,14,14
+industrial_sales_revenue,9,9,14,14,14,14,14,14,14,14,14,14,14,14,15,15,15,15,15,15,16,15,15,15,15
+industrial_sales_mwh,10,10,15,15,15,15,15,15,15,15,15,15,15,15,16,16,16,16,16,16,17,16,16,16,16
+industrial_customers,11,11,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,17,17,17,18,17,17,17,17
+transportation_sales_revenue,12,12,17,17,17,17,17,17,17,17,17,17,17,17,18,18,18,18,18,18,19,18,18,18,18
+transportation_sales_mwh,13,13,18,18,18,18,18,18,18,18,18,18,18,18,19,19,19,19,19,19,20,19,19,19,19
+transportation_customers,14,14,19,19,19,19,19,19,19,19,19,19,19,19,20,20,20,20,20,20,21,20,20,20,20
+other_sales_revenue,15,15,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+other_sales_mwh,16,16,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+other_customers,17,17,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+total_sales_revenue,18,18,20,20,20,20,20,20,20,20,20,20,20,20,21,21,21,21,21,21,22,21,21,21,21
+total_sales_mwh,19,19,21,21,21,21,21,21,21,21,21,21,21,21,22,22,22,22,22,22,23,22,22,22,22
+total_customers,20,20,22,22,22,22,22,22,22,22,22,22,22,22,23,23,23,23,23,23,24,23,23,23,23
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/service_territory_eia861.csv b/src/pudl/package_data/eia861/column_maps/service_territory_eia861.csv
index 117da4fe88..ceb6f588a5 100644
--- a/src/pudl/package_data/eia861/column_maps/service_territory_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/service_territory_eia861.csv
@@ -1,8 +1,8 @@
-year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,3,3
-state,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4
-county,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,5,5,5,5
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,3,3,3
+state,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4
+county,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,5,5,5,5,5
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/short_form_eia861.csv b/src/pudl/package_data/eia861/column_maps/short_form_eia861.csv
index fc93964e3d..c7793e583d 100644
--- a/src/pudl/package_data/eia861/column_maps/short_form_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/short_form_eia861.csv
@@ -1,16 +1,16 @@
-year_index,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,-1,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,-1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2,-1,2,2,2
-entity_type,-1,-1,-1,3,3,3,3,-1,3,3,3
-state,3,3,3,4,4,4,4,-1,4,4,4
-balancing_authority_code_eia,-1,4,4,5,5,5,5,-1,5,5,5
-sales_revenue,4,5,5,6,6,6,6,-1,6,6,6
-sales_mwh,5,6,6,7,7,7,7,-1,7,7,7
-customers,6,7,7,8,8,8,8,-1,8,8,8
-num_water_heaters,-1,8,8,9,9,9,9,-1,9,9,9
-has_net_metering,8,9,9,10,10,10,10,-1,10,10,10
-has_demand_side_management,9,10,10,11,11,11,11,-1,11,11,11
-has_time_responsive_programs,10,11,11,12,12,12,12,-1,12,12,12
-has_green_pricing,7,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,-1,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,-1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,-1,2,2,2,2
+entity_type,-1,-1,-1,3,3,3,3,-1,3,3,3,3
+state,3,3,3,4,4,4,4,-1,4,4,4,4
+balancing_authority_code_eia,-1,4,4,5,5,5,5,-1,5,5,5,5
+sales_revenue,4,5,5,6,6,6,6,-1,6,6,6,6
+sales_mwh,5,6,6,7,7,7,7,-1,7,7,7,7
+customers,6,7,7,8,8,8,8,-1,8,8,8,8
+num_water_heaters,-1,8,8,9,9,9,9,-1,9,9,9,9
+has_net_metering,8,9,9,10,10,10,10,-1,10,10,10,10
+has_demand_side_management,9,10,10,11,11,11,11,-1,11,11,11,11
+has_time_responsive_programs,10,11,11,12,12,12,12,-1,12,12,12,12
+has_green_pricing,7,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/column_maps/utility_data_eia861.csv b/src/pudl/package_data/eia861/column_maps/utility_data_eia861.csv
index 2cb89971ac..e43d1a3019 100644
--- a/src/pudl/package_data/eia861/column_maps/utility_data_eia861.csv
+++ b/src/pudl/package_data/eia861/column_maps/utility_data_eia861.csv
@@ -1,36 +1,36 @@
-year_index,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-utility_name_eia,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,-1,-1,-1
-state,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3,3
-entity_type,4,4,4,4,4,4,4,4,4,4,4,4,5,4,4,4
-nerc_region,5,5,5,5,5,5,5,5,5,5,5,5,6,5,5,5
-tre_nerc_region_operation,6,6,6,6,6,6,6,6,6,6,6,6,7,6,6,6
-frcc_nerc_region_operation,7,7,7,7,7,7,7,7,7,7,7,7,8,7,7,7
-mro_nerc_region_operation,8,8,8,8,8,8,8,8,8,8,8,8,9,8,8,8
-npcc_nerc_region_operation,9,9,9,9,9,9,9,9,9,9,9,9,10,9,9,9
-rfc_nerc_region_operation,10,10,10,10,10,10,10,10,10,10,10,10,11,10,10,10
-serc_nerc_region_operation,11,11,11,11,11,11,11,11,11,11,11,11,12,11,11,11
-spp_nerc_region_operation,12,12,12,12,12,12,12,12,12,12,12,12,13,12,12,12
-wecc_nerc_region_operation,13,13,13,13,13,13,13,13,13,13,13,13,14,13,13,13
-operates_generating_plant,14,14,14,22,22,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-generation_activity,15,15,15,23,23,22,22,22,22,22,22,22,23,22,22,22
-transmission_activity,16,16,16,24,24,23,23,23,23,23,23,23,24,23,23,23
-buying_transmission_activity,17,17,17,25,25,24,24,24,24,24,24,24,25,24,24,24
-distribution_activity,18,18,18,26,26,25,25,25,25,25,25,25,26,25,25,25
-buying_distribution_activity,19,19,19,27,27,26,26,26,26,26,26,26,27,26,26,26
-wholesale_marketing_activity,20,20,20,28,28,27,27,27,27,27,27,27,28,27,27,27
-retail_marketing_activity,21,21,21,29,29,28,28,28,28,28,28,28,29,28,28,28
-bundled_activity,22,22,22,30,30,29,29,29,29,29,29,29,30,29,29,29
-alternative_fuel_vehicle_activity,23,23,23,31,31,30,30,30,30,30,30,30,31,30,30,30
-alternative_fuel_vehicle_2_activity,24,24,24,32,32,31,31,31,31,31,31,31,32,31,31,31
-caiso_rto_operation,-1,-1,-1,14,14,14,14,14,14,14,14,14,15,14,14,14
-ercot_rto_operation,-1,-1,-1,15,15,15,15,15,15,15,15,15,16,15,15,15
-pjm_rto_operation,-1,-1,-1,16,16,16,16,16,16,16,16,16,17,16,16,16
-nyiso_rto_operation,-1,-1,-1,17,17,17,17,17,17,17,17,17,18,17,17,17
-spp_rto_operation,-1,-1,-1,18,18,18,18,18,18,18,18,18,19,18,18,18
-miso_rto_operation,-1,-1,-1,19,19,19,19,19,19,19,19,19,20,19,19,19
-isone_rto_operation,-1,-1,-1,20,20,20,20,20,20,20,20,20,21,20,20,20
-other_rto_operation,-1,-1,-1,21,21,21,21,21,21,21,21,21,22,21,21,21
-early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+year_index,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+report_year,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+utility_id_eia,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+utility_name_eia,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+short_form,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,-1,-1,-1,-1
+state,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3,3,3
+entity_type,4,4,4,4,4,4,4,4,4,4,4,4,5,4,4,4,4
+nerc_region,5,5,5,5,5,5,5,5,5,5,5,5,6,5,5,5,5
+tre_nerc_region_operation,6,6,6,6,6,6,6,6,6,6,6,6,7,6,6,6,6
+frcc_nerc_region_operation,7,7,7,7,7,7,7,7,7,7,7,7,8,7,7,7,7
+mro_nerc_region_operation,8,8,8,8,8,8,8,8,8,8,8,8,9,8,8,8,8
+npcc_nerc_region_operation,9,9,9,9,9,9,9,9,9,9,9,9,10,9,9,9,9
+rfc_nerc_region_operation,10,10,10,10,10,10,10,10,10,10,10,10,11,10,10,10,10
+serc_nerc_region_operation,11,11,11,11,11,11,11,11,11,11,11,11,12,11,11,11,11
+spp_nerc_region_operation,12,12,12,12,12,12,12,12,12,12,12,12,13,12,12,12,12
+wecc_nerc_region_operation,13,13,13,13,13,13,13,13,13,13,13,13,14,13,13,13,13
+operates_generating_plant,14,14,14,22,22,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+generation_activity,15,15,15,23,23,22,22,22,22,22,22,22,23,22,22,22,22
+transmission_activity,16,16,16,24,24,23,23,23,23,23,23,23,24,23,23,23,23
+buying_transmission_activity,17,17,17,25,25,24,24,24,24,24,24,24,25,24,24,24,24
+distribution_activity,18,18,18,26,26,25,25,25,25,25,25,25,26,25,25,25,25
+buying_distribution_activity,19,19,19,27,27,26,26,26,26,26,26,26,27,26,26,26,26
+wholesale_marketing_activity,20,20,20,28,28,27,27,27,27,27,27,27,28,27,27,27,27
+retail_marketing_activity,21,21,21,29,29,28,28,28,28,28,28,28,29,28,28,28,28
+bundled_activity,22,22,22,30,30,29,29,29,29,29,29,29,30,29,29,29,29
+alternative_fuel_vehicle_activity,23,23,23,31,31,30,30,30,30,30,30,30,31,30,30,30,30
+alternative_fuel_vehicle_2_activity,24,24,24,32,32,31,31,31,31,31,31,31,32,31,31,31,31
+caiso_rto_operation,-1,-1,-1,14,14,14,14,14,14,14,14,14,15,14,14,14,14
+ercot_rto_operation,-1,-1,-1,15,15,15,15,15,15,15,15,15,16,15,15,15,15
+pjm_rto_operation,-1,-1,-1,16,16,16,16,16,16,16,16,16,17,16,16,16,16
+nyiso_rto_operation,-1,-1,-1,17,17,17,17,17,17,17,17,17,18,17,17,17,17
+spp_rto_operation,-1,-1,-1,18,18,18,18,18,18,18,18,18,19,18,18,18,18
+miso_rto_operation,-1,-1,-1,19,19,19,19,19,19,19,19,19,20,19,19,19,19
+isone_rto_operation,-1,-1,-1,20,20,20,20,20,20,20,20,20,21,20,20,20,20
+other_rto_operation,-1,-1,-1,21,21,21,21,21,21,21,21,21,22,21,21,21,21
+early_release,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
diff --git a/src/pudl/package_data/eia861/file_map.csv b/src/pudl/package_data/eia861/file_map.csv
index cee66b5ca4..c970de642e 100644
--- a/src/pudl/package_data/eia861/file_map.csv
+++ b/src/pudl/package_data/eia861/file_map.csv
@@ -1,22 +1,22 @@
-page,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-advanced_metering_infrastructure_eia861,-1,-1,-1,-1,-1,-1,-1,-1,2007/file8_2007.xls,2008/file8_2008.xls,2009/file8_2009.xls,file8_2010.xls,file8_2011.xls,advanced_meters_2012.xls,Advanced_Meters_2013.xls,Advanced_Meters_2014.xls,Advanced_Meters_2015.xlsx,Advanced_Meters_2016.xlsx,Advanced_Meters_2017.xlsx,Advanced_Meters_2018.xlsx,Advanced_Meters_2019.xlsx,Advanced_Meters_2020.xlsx,Advanced_Meters_2021.xlsx,Advanced_Meters_2022.xlsx
-balancing_authority_eia861,-1,-1,2001/file1_cao.xls,2002/file1_cao.xls,2003/file1_cao.xls,2004/file1_cao.xls,2005/file1_cao.xls,file1_cao.xls,2007/file1_cao_2007.xls,2008/file1_cao_2008.xls,2009/file1_cao_2009.xls,file1_cao_2010.xls,file1_cao_2011.xls,balancing_authority_2012.xls,Balancing_Authority_2013.xls,Balancing_Authority_2014.xls,Balancing_Authority_2015.xlsx,Balancing_Authority_2016.xlsx,Balancing_Authority_2017.xlsx,Balancing_Authority_2018.xlsx,Balancing_Authority_2019.xlsx,Balancing_Authority_2020.xlsx,Balancing_Authority_2021.xlsx,Balancing_Authority_2022.xlsx
-delivery_companies_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Delivery_Companies_2020.xlsx,Delivery_Companies_2021.xlsx,Delivery_Companies_2022.xlsx
-demand_response_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Demand_Response_2013.xls,Demand_Response_2014.xls,Demand_Response_2015.xlsx,Demand_Response_2016.xlsx,Demand_Response_2017.xlsx,Demand_Response_2018.xlsx,Demand_Response_2019.xlsx,Demand_Response_2020.xlsx,Demand_Response_2021.xlsx,Demand_Response_2022.xlsx
-demand_side_management_eia861,FILE4.xls,FILE4.xls,2001/file3.xls,2002/file3.xls,2003/file3.xls,2004/file3.xls,2005/file3.xls,file3.xls,2007/file3_2007.xls,2008/file3_2008.xls,2009/file3_2009.xls,file3_2010.xls,file3_2011.xls,dsm_2012.xls,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-distributed_generation_eia861,-1,-1,-1,-1,-1,2004/file6.xls,2005/file6.xls,file6.xls,2007/file6_2007.xls,2008/file6_2008.xls,2009/file6_2009.xls,file6_2010.xls,file6_2011.xls,distributed_generation_2012.xls,Distributed_Generation_2013.xls,Distributed_Generation_2014.xls,Distributed_Generation_2015.xlsx,-1,-1,-1,-1,-1,-1,-1
-distribution_systems_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Distribution_Systems_2016.xlsx,Distribution_Systems_2017.xlsx,Distribution_Systems_2018.xlsx,Distribution_Systems_2019.xlsx,Distribution_Systems_2020.xlsx,Distribution_Systems_2021.xlsx,Distribution_Systems_2022.xlsx
-dynamic_pricing_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Dynamic_Pricing2013.xls,Dynamic_Pricing2014.xls,Dynamic_Pricing2015.xlsx,Dynamic_Pricing2016.xlsx,Dynamic_Pricing_2017.xlsx,Dynamic_Pricing_2018.xlsx,Dynamic_Pricing_2019.xlsx,Dynamic_Pricing_2020.xlsx,Dynamic_Pricing_2021.xlsx,Dynamic_Pricing_2022.xlsx
-energy_efficiency_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Energy_Efficiency_2013.xlsx,Energy_Efficiency_2014.xlsx,Energy_Efficiency_2015.xlsx,Energy_Efficiency_2016.xlsx,Energy_Efficiency_2017.xlsx,Energy_Efficiency_2018.xlsx,Energy_Efficiency_2019.xlsx,Energy_Efficiency_2020.xlsx,Energy_Efficiency_2021.xlsx,Energy_Efficiency_2022.xlsx
-frame_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Frame_2016.xlsx,Frame_2017.xlsx,Frame_2018.xlsx,Frame_2019.xlsx,Frame_2020.xlsx,Frame_2021.xlsx,Frame_2022.xlsx
-green_pricing_eia861,-1,-1,-1,2002/file5.xls,2003/file5.xls,2004/file5.xls,2005/file5.xls,file5.xls,2007/file5_2007.xls,2008/file5_2008.xls,2009/file5_2009.xls,file5_2010.xls,file5_2011.xls,green_pricing_2012.xls,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-mergers_eia861,-1,-1,-1,-1,-1,-1,-1,-1,2007/file7_2007.xls,2008/file7_2008.xls,2009/file7_2009.xls,file7_2010.xls,file7_2011.xls,mergers_2012.xls,Mergers_2013.xls,Mergers_2014.xls,Mergers_2015.xlsx,Mergers_2016.xlsx,Mergers_2017.xlsx,Mergers_2018.xlsx,Mergers_2019.xlsx,Mergers_2020.xlsx,Mergers_2021.xlsx,Mergers_2022.xlsx
-net_metering_eia861,-1,-1,-1,2002/file5.xls,2003/file5.xls,2004/file5.xls,2005/file5.xls,file5.xls,2007/file5_2007.xls,2008/file5_2008.xls,2009/file5_2009.xls,file5_2010.xls,file5_2011.xls,net_metering_2012.xls,Net_Metering_2013.xls,Net_Metering_2014.xls,Net_Metering_2015.xlsx,Net_Metering_2016.xlsx,Net_Metering_2017.xlsx,Net_Metering_2018.xlsx,Net_Metering_2019.xlsx,Net_Metering_2020.xlsx,Net_Metering_2021.xlsx,Net_Metering_2022.xlsx
-non_net_metering_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Non_Net_Metering_Distributed_2016.xlsx,Non_Net_Metering_Distributed_2017.xlsx,Non_Net_Metering_Distributed_2018.xlsx,Non_Net_Metering_Distributed_2019.xlsx,Non_Net_Metering_Distributed_2020.xlsx,Non_Net_Metering_Distributed_2021.xlsx,Non_Net_Metering_Distributed_2022.xlsx
-operational_data_eia861,File1.xls,FILE1.xls,2001/file1.xls,2002/file1.xls,2003/file1.xls,2004/file1.xls,2005/file1.xls,file1.xls,2007/file1_2007.xls,2008/file1_2008.xls,2009/file1_2009.xls,file1_2010.xls,file1_2011.xls,operational_data_2012.xls,Operational_Data_2013.xlsx,Operational_Data_2014.xlsx,Operational_Data_2015.xlsx,Operational_Data_2016.xlsx,Operational_Data_2017.xlsx,Operational_Data_2018.xlsx,Operational_Data_2019.xlsx,Operational_Data_2020.xlsx,Operational_Data_2021.xlsx,Operational_Data_2022.xlsx
-reliability_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Reliability_2013.xlsx,Reliability_2014.xlsx,Reliability_2015.xlsx,Reliability_2016.xlsx,Reliability_2017.xlsx,Reliability_2018.xlsx,Reliability_2019.xlsx,Reliability_2020.xlsx,Reliability_2021.xlsx,Reliability_2022.xlsx
-sales_eia861,FILE2.xls,FILE2.xls,2001/file2.xls,2002/file2.xls,2003/file2.xls,2004/file2.xls,2005/file2.xls,file2.xls,2007/file2_2007.xls,2008/file2_2008.xls,2009/file2_2009.xls,file2_2010.xls,file2_2011.xls,Sales_Ult_Cust_2012.xlsx,Sales_Ult_Cust_2013.xls,Sales_Ult_Cust_2014.xls,Sales_Ult_Cust_2015.xlsx,Sales_Ult_Cust_2016.xlsx,Sales_Ult_Cust_2017.xlsx,Sales_Ult_Cust_2018.xlsx,Sales_Ult_Cust_2019.xlsx,Sales_Ult_Cust_2020.xlsx,Sales_Ult_Cust_2021.xlsx,Sales_Ult_Cust_2022.xlsx
-sales_customer_sited_eia861,,,,,,,,,,,,,,Sales_Ult_Cust_CS_2012.xlsx,Sales_Ult_Cust_CS_2013.xls,Sales_Ult_Cust_CS_2014.xls,Sales_Ult_Cust_CS_2015.xlsx,Sales_Ult_Cust_CS_2016.xlsx,Sales_Ult_Cust_CS_2017.xlsx,Sales_Ult_Cust_2018_CS.xlsx,Sales_Ult_Cust_2019_CS.xlsx,Sales_Ult_Cust_2020_CS.xlsx,Sales_Ult_Cust_CS_2021.xlsx,Sales_Ult_Cust_CS_2022.xlsx
-service_territory_eia861,FILE5.xls,FILE5.xls,2001/file4.xls,2002/file4.xls,2003/file4.xls,2004/file4.xls,2005/file4.xls,file4.xls,2007/file4_2007.xls,2008/file4_2008.xls,2009/file4_2009.xls,file4_2010.xls,file4_2011.xls,service_territory_2012.xls,Service_Territory_2013.xls,Service_Territory_2014.xls,Service_Territory_2015.xlsx,Service_Territory_2016.xlsx,Service_Territory_2017.xlsx,Service_Territory_2018.xlsx,Service_Territory_2019.xlsx,Service_Territory_2020.xlsx,Service_Territory_2021.xlsx,Service_Territory_2022.xlsx
-short_form_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,short_form_2012.xls,Short_Form_2013.xls,Short_Form_2014.xls,Short_Form_2015.xlsx,Short_Form_2016.xlsx,Short_Form_2017.xlsx,Short_Form_2018.xlsx,-1,Short_Form_2020.xlsx,Short_Form_2021.xlsx,Short_Form_2022.xlsx
-utility_data_eia861,-1,-1,-1,-1,-1,-1,-1,-1,2007/file1a_2007.xls,2008/file1_a_2008.xls,2009/file1_a_2009.xls,file1a_2010.xls,file1a_2011.xls,utility_data_2012.xls,Utility_Data_2013.xls,Utility_Data_2014.xls,Utility_Data_2015.xlsx,Utility_Data_2016.xlsx,Utility_Data_2017.xlsx,Utility_Data_2018.xlsx,Utility_Data_2019.xlsx,Utility_Data_2020.xlsx,Utility_Data_2021.xlsx,Utility_Data_2022.xlsx
+page,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+advanced_metering_infrastructure_eia861,-1,-1,-1,-1,-1,-1,-1,-1,2007/file8_2007.xls,2008/file8_2008.xls,2009/file8_2009.xls,file8_2010.xls,file8_2011.xls,advanced_meters_2012.xls,Advanced_Meters_2013.xls,Advanced_Meters_2014.xls,Advanced_Meters_2015.xlsx,Advanced_Meters_2016.xlsx,Advanced_Meters_2017.xlsx,Advanced_Meters_2018.xlsx,Advanced_Meters_2019.xlsx,Advanced_Meters_2020.xlsx,Advanced_Meters_2021.xlsx,Advanced_Meters_2022.xlsx,Advanced_Meters_2023.xlsx
+balancing_authority_eia861,-1,-1,2001/file1_cao.xls,2002/file1_cao.xls,2003/file1_cao.xls,2004/file1_cao.xls,2005/file1_cao.xls,file1_cao.xls,2007/file1_cao_2007.xls,2008/file1_cao_2008.xls,2009/file1_cao_2009.xls,file1_cao_2010.xls,file1_cao_2011.xls,balancing_authority_2012.xls,Balancing_Authority_2013.xls,Balancing_Authority_2014.xls,Balancing_Authority_2015.xlsx,Balancing_Authority_2016.xlsx,Balancing_Authority_2017.xlsx,Balancing_Authority_2018.xlsx,Balancing_Authority_2019.xlsx,Balancing_Authority_2020.xlsx,Balancing_Authority_2021.xlsx,Balancing_Authority_2022.xlsx,Balancing_Authority_2023.xlsx
+delivery_companies_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Delivery_Companies_2020.xlsx,Delivery_Companies_2021.xlsx,Delivery_Companies_2022.xlsx,Delivery_Companies_2023.xlsx
+demand_response_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Demand_Response_2013.xls,Demand_Response_2014.xls,Demand_Response_2015.xlsx,Demand_Response_2016.xlsx,Demand_Response_2017.xlsx,Demand_Response_2018.xlsx,Demand_Response_2019.xlsx,Demand_Response_2020.xlsx,Demand_Response_2021.xlsx,Demand_Response_2022.xlsx,Demand_Response_2023.xlsx
+demand_side_management_eia861,FILE4.xls,FILE4.xls,2001/file3.xls,2002/file3.xls,2003/file3.xls,2004/file3.xls,2005/file3.xls,file3.xls,2007/file3_2007.xls,2008/file3_2008.xls,2009/file3_2009.xls,file3_2010.xls,file3_2011.xls,dsm_2012.xls,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+distributed_generation_eia861,-1,-1,-1,-1,-1,2004/file6.xls,2005/file6.xls,file6.xls,2007/file6_2007.xls,2008/file6_2008.xls,2009/file6_2009.xls,file6_2010.xls,file6_2011.xls,distributed_generation_2012.xls,Distributed_Generation_2013.xls,Distributed_Generation_2014.xls,Distributed_Generation_2015.xlsx,-1,-1,-1,-1,-1,-1,-1,-1
+distribution_systems_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Distribution_Systems_2016.xlsx,Distribution_Systems_2017.xlsx,Distribution_Systems_2018.xlsx,Distribution_Systems_2019.xlsx,Distribution_Systems_2020.xlsx,Distribution_Systems_2021.xlsx,Distribution_Systems_2022.xlsx,Distribution_Systems_2023.xlsx
+dynamic_pricing_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Dynamic_Pricing2013.xls,Dynamic_Pricing2014.xls,Dynamic_Pricing2015.xlsx,Dynamic_Pricing2016.xlsx,Dynamic_Pricing_2017.xlsx,Dynamic_Pricing_2018.xlsx,Dynamic_Pricing_2019.xlsx,Dynamic_Pricing_2020.xlsx,Dynamic_Pricing_2021.xlsx,Dynamic_Pricing_2022.xlsx,Dynamic_Pricing_2023.xlsx
+energy_efficiency_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Energy_Efficiency_2013.xlsx,Energy_Efficiency_2014.xlsx,Energy_Efficiency_2015.xlsx,Energy_Efficiency_2016.xlsx,Energy_Efficiency_2017.xlsx,Energy_Efficiency_2018.xlsx,Energy_Efficiency_2019.xlsx,Energy_Efficiency_2020.xlsx,Energy_Efficiency_2021.xlsx,Energy_Efficiency_2022.xlsx,Energy_Efficiency_2023.xlsx
+frame_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Frame_2016.xlsx,Frame_2017.xlsx,Frame_2018.xlsx,Frame_2019.xlsx,Frame_2020.xlsx,Frame_2021.xlsx,Frame_2022.xlsx,Frame_2023.xlsx
+green_pricing_eia861,-1,-1,-1,2002/file5.xls,2003/file5.xls,2004/file5.xls,2005/file5.xls,file5.xls,2007/file5_2007.xls,2008/file5_2008.xls,2009/file5_2009.xls,file5_2010.xls,file5_2011.xls,green_pricing_2012.xls,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+mergers_eia861,-1,-1,-1,-1,-1,-1,-1,-1,2007/file7_2007.xls,2008/file7_2008.xls,2009/file7_2009.xls,file7_2010.xls,file7_2011.xls,mergers_2012.xls,Mergers_2013.xls,Mergers_2014.xls,Mergers_2015.xlsx,Mergers_2016.xlsx,Mergers_2017.xlsx,Mergers_2018.xlsx,Mergers_2019.xlsx,Mergers_2020.xlsx,Mergers_2021.xlsx,Mergers_2022.xlsx,Mergers_2023.xlsx
+net_metering_eia861,-1,-1,-1,2002/file5.xls,2003/file5.xls,2004/file5.xls,2005/file5.xls,file5.xls,2007/file5_2007.xls,2008/file5_2008.xls,2009/file5_2009.xls,file5_2010.xls,file5_2011.xls,net_metering_2012.xls,Net_Metering_2013.xls,Net_Metering_2014.xls,Net_Metering_2015.xlsx,Net_Metering_2016.xlsx,Net_Metering_2017.xlsx,Net_Metering_2018.xlsx,Net_Metering_2019.xlsx,Net_Metering_2020.xlsx,Net_Metering_2021.xlsx,Net_Metering_2022.xlsx,Net_Metering_2023.xlsx
+non_net_metering_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Non_Net_Metering_Distributed_2016.xlsx,Non_Net_Metering_Distributed_2017.xlsx,Non_Net_Metering_Distributed_2018.xlsx,Non_Net_Metering_Distributed_2019.xlsx,Non_Net_Metering_Distributed_2020.xlsx,Non_Net_Metering_Distributed_2021.xlsx,Non_Net_Metering_Distributed_2022.xlsx,Non_Net_Metering_Distributed_2023.xlsx
+operational_data_eia861,File1.xls,FILE1.xls,2001/file1.xls,2002/file1.xls,2003/file1.xls,2004/file1.xls,2005/file1.xls,file1.xls,2007/file1_2007.xls,2008/file1_2008.xls,2009/file1_2009.xls,file1_2010.xls,file1_2011.xls,operational_data_2012.xls,Operational_Data_2013.xlsx,Operational_Data_2014.xlsx,Operational_Data_2015.xlsx,Operational_Data_2016.xlsx,Operational_Data_2017.xlsx,Operational_Data_2018.xlsx,Operational_Data_2019.xlsx,Operational_Data_2020.xlsx,Operational_Data_2021.xlsx,Operational_Data_2022.xlsx,Operational_Data_2023.xlsx
+reliability_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Reliability_2013.xlsx,Reliability_2014.xlsx,Reliability_2015.xlsx,Reliability_2016.xlsx,Reliability_2017.xlsx,Reliability_2018.xlsx,Reliability_2019.xlsx,Reliability_2020.xlsx,Reliability_2021.xlsx,Reliability_2022.xlsx,Reliability_2023.xlsx
+sales_eia861,FILE2.xls,FILE2.xls,2001/file2.xls,2002/file2.xls,2003/file2.xls,2004/file2.xls,2005/file2.xls,file2.xls,2007/file2_2007.xls,2008/file2_2008.xls,2009/file2_2009.xls,file2_2010.xls,file2_2011.xls,Sales_Ult_Cust_2012.xlsx,Sales_Ult_Cust_2013.xls,Sales_Ult_Cust_2014.xls,Sales_Ult_Cust_2015.xlsx,Sales_Ult_Cust_2016.xlsx,Sales_Ult_Cust_2017.xlsx,Sales_Ult_Cust_2018.xlsx,Sales_Ult_Cust_2019.xlsx,Sales_Ult_Cust_2020.xlsx,Sales_Ult_Cust_2021.xlsx,Sales_Ult_Cust_2022.xlsx,Sales_Ult_Cust_2023.xlsx
+sales_customer_sited_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,Sales_Ult_Cust_CS_2012.xlsx,Sales_Ult_Cust_CS_2013.xls,Sales_Ult_Cust_CS_2014.xls,Sales_Ult_Cust_CS_2015.xlsx,Sales_Ult_Cust_CS_2016.xlsx,Sales_Ult_Cust_CS_2017.xlsx,Sales_Ult_Cust_2018_CS.xlsx,Sales_Ult_Cust_2019_CS.xlsx,Sales_Ult_Cust_2020_CS.xlsx,Sales_Ult_Cust_CS_2021.xlsx,Sales_Ult_Cust_CS_2022.xlsx,Sales_Ult_Cust_CS_2023.xlsx
+service_territory_eia861,FILE5.xls,FILE5.xls,2001/file4.xls,2002/file4.xls,2003/file4.xls,2004/file4.xls,2005/file4.xls,file4.xls,2007/file4_2007.xls,2008/file4_2008.xls,2009/file4_2009.xls,file4_2010.xls,file4_2011.xls,service_territory_2012.xls,Service_Territory_2013.xls,Service_Territory_2014.xls,Service_Territory_2015.xlsx,Service_Territory_2016.xlsx,Service_Territory_2017.xlsx,Service_Territory_2018.xlsx,Service_Territory_2019.xlsx,Service_Territory_2020.xlsx,Service_Territory_2021.xlsx,Service_Territory_2022.xlsx,Service_Territory_2023.xlsx
+short_form_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,short_form_2012.xls,Short_Form_2013.xls,Short_Form_2014.xls,Short_Form_2015.xlsx,Short_Form_2016.xlsx,Short_Form_2017.xlsx,Short_Form_2018.xlsx,-1,Short_Form_2020.xlsx,Short_Form_2021.xlsx,Short_Form_2022.xlsx,Short_Form_2023.xlsx
+utility_data_eia861,-1,-1,-1,-1,-1,-1,-1,-1,2007/file1a_2007.xls,2008/file1_a_2008.xls,2009/file1_a_2009.xls,file1a_2010.xls,file1a_2011.xls,utility_data_2012.xls,Utility_Data_2013.xls,Utility_Data_2014.xls,Utility_Data_2015.xlsx,Utility_Data_2016.xlsx,Utility_Data_2017.xlsx,Utility_Data_2018.xlsx,Utility_Data_2019.xlsx,Utility_Data_2020.xlsx,Utility_Data_2021.xlsx,Utility_Data_2022.xlsx,Utility_Data_2023.xlsx
diff --git a/src/pudl/package_data/eia861/page_map.csv b/src/pudl/package_data/eia861/page_map.csv
index 0c1681ca73..23f6c5acb5 100644
--- a/src/pudl/package_data/eia861/page_map.csv
+++ b/src/pudl/package_data/eia861/page_map.csv
@@ -1,40 +1,40 @@
-year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-advanced_metering_infrastructure_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-advanced_metering_infrastructure_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1
-balancing_authority_eia861,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-delivery_companies_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0
-demand_response_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0
-demand_response_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1
-demand_side_management_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1
-demand_side_management_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,-1,-1,-1,1,1,1,-1,-1,-1,-1
-dispersed_generation_eia861,-1,-1,-1,-1,-1,1,1,1,1,1,1,2,2,2,2,2,2,-1,-1,-1,-1,-1,-1,-1
-dispersed_generation_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,3,3,3,3,-1,-1,-1,-1,-1,-1,-1
-distributed_generation_eia861,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1
-distributed_generation_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1
-distribution_systems_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0
-distribution_systems_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1
-dynamic_pricing_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0
-dynamic_pricing_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1
-energy_efficiency_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0
-energy_efficiency_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1
-frame_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0
-green_pricing_eia861,-1,-1,-1,0,0,0,0,0,0,1,1,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-green_pricing_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-mergers_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-net_metering_eia861,-1,-1,-1,1,1,1,1,1,1,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0
-net_metering_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,1,1,1,1,1,1,1,1,1,1,1
-net_metering_tpos_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2
-non_net_metering_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0
-non_net_metering_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1
-operational_data_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-operational_data_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1
-reliability_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0
-reliability_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1
-sales_decoupled_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2
-sales_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-sales_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-service_territory_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-service_territory_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1
-short_form_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,-1,0,0,0
-utility_data_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-utility_data_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1
+year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+advanced_metering_infrastructure_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+advanced_metering_infrastructure_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1
+balancing_authority_eia861,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+delivery_companies_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0
+demand_response_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0
+demand_response_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1
+demand_side_management_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1
+demand_side_management_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,-1,-1,-1,1,1,1,-1,-1,-1,-1,-1
+dispersed_generation_eia861,-1,-1,-1,-1,-1,1,1,1,1,1,1,2,2,2,2,2,2,-1,-1,-1,-1,-1,-1,-1,-1
+dispersed_generation_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,3,3,3,3,-1,-1,-1,-1,-1,-1,-1,-1
+distributed_generation_eia861,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1
+distributed_generation_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1
+distribution_systems_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0
+distribution_systems_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1
+dynamic_pricing_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0
+dynamic_pricing_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1
+energy_efficiency_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0
+energy_efficiency_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1
+frame_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0
+green_pricing_eia861,-1,-1,-1,0,0,0,0,0,0,1,1,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+green_pricing_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+mergers_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+net_metering_eia861,-1,-1,-1,1,1,1,1,1,1,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0
+net_metering_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3,3,1,1,1,1,1,1,1,1,1,1,1,1
+net_metering_tpos_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2,2
+non_net_metering_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0
+non_net_metering_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1
+operational_data_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+operational_data_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+reliability_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0
+reliability_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1
+sales_decoupled_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2
+sales_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+sales_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+service_territory_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+service_territory_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1
+short_form_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,-1,0,0,0,0
+utility_data_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+utility_data_territories_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1
diff --git a/src/pudl/package_data/eia861/skipfooter.csv b/src/pudl/package_data/eia861/skipfooter.csv
index b519bd883a..061e1ecc07 100644
--- a/src/pudl/package_data/eia861/skipfooter.csv
+++ b/src/pudl/package_data/eia861/skipfooter.csv
@@ -1,21 +1,21 @@
-year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-advanced_metering_infrastructure_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1
-balancing_authority_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-delivery_companies_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1
-demand_response_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-demand_side_management_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-distributed_generation_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-distribution_systems_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-dynamic_pricing_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-energy_efficiency_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1
-frame_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-green_pricing_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-mergers_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-net_metering_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1
-non_net_metering_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1
-operational_data_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-reliability_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1
-sales_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1
-service_territory_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-short_form_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,1,1,1
-utility_data_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+advanced_metering_infrastructure_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1
+balancing_authority_eia861,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+delivery_companies_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1
+demand_response_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0
+demand_side_management_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+distributed_generation_eia861,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1
+distribution_systems_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0
+dynamic_pricing_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0
+energy_efficiency_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1
+frame_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0
+green_pricing_eia861,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+mergers_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+net_metering_eia861,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1
+non_net_metering_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1
+operational_data_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+reliability_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1
+sales_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1
+service_territory_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+short_form_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,1,1,1,1,1,-1,1,1,1,1
+utility_data_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/src/pudl/package_data/eia861/skiprows.csv b/src/pudl/package_data/eia861/skiprows.csv
index 840e63f8e7..b94dbaf6cd 100644
--- a/src/pudl/package_data/eia861/skiprows.csv
+++ b/src/pudl/package_data/eia861/skiprows.csv
@@ -1,21 +1,21 @@
-year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
-advanced_metering_infrastructure_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,10,13,1,1,1,1,1,1,1,1,1,1,1
-balancing_authority_eia861,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-delivery_companies_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2
-demand_response_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2
-demand_side_management_eia861,0,0,0,0,0,0,0,0,0,0,0,11,11,2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-distributed_generation_eia861,-1,-1,-1,-1,-1,0,0,0,0,0,0,9,10,1,1,1,1,-1,-1,-1,-1,-1,-1,-1
-distribution_systems_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0
-dynamic_pricing_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2
-energy_efficiency_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2
-frame_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0
-green_pricing_eia861,-1,-1,-1,0,0,0,0,0,0,0,0,10,8,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-mergers_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-net_metering_eia861,-1,-1,-1,0,0,0,0,0,0,0,0,8,8,2,2,2,2,3,2,2,2,2,2,2
-non_net_metering_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,1,1,1,1,1,1
-operational_data_eia861,0,0,0,0,0,0,0,0,0,0,0,7,8,2,2,2,2,2,2,2,2,2,2,2
-reliability_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,2,2
-sales_eia861,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-service_territory_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-short_form_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,-1,0,0,0
-utility_data_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1
+year_index,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
+advanced_metering_infrastructure_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,10,13,1,1,1,1,1,1,1,1,1,1,1,1
+balancing_authority_eia861,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+delivery_companies_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2
+demand_response_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2,2
+demand_side_management_eia861,0,0,0,0,0,0,0,0,0,0,0,11,11,2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+distributed_generation_eia861,-1,-1,-1,-1,-1,0,0,0,0,0,0,9,10,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1
+distribution_systems_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0
+dynamic_pricing_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2,2
+energy_efficiency_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,2,2,2,2,2,2,2,2,2,2
+frame_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0
+green_pricing_eia861,-1,-1,-1,0,0,0,0,0,0,0,0,10,8,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+mergers_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+net_metering_eia861,-1,-1,-1,0,0,0,0,0,0,0,0,8,8,2,2,2,2,3,2,2,2,2,2,2,2
+non_net_metering_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2,1,1,1,1,1,1,1
+operational_data_eia861,0,0,0,0,0,0,0,0,0,0,0,7,8,2,2,2,2,2,2,2,2,2,2,2,2
+reliability_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,2,2,2
+sales_eia861,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+service_territory_eia861,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+short_form_eia861,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,-1,0,0,0,0
+utility_data_eia861,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1
diff --git a/src/pudl/package_data/settings/etl_fast.yml b/src/pudl/package_data/settings/etl_fast.yml
index 8a43f54693..2495504c80 100644
--- a/src/pudl/package_data/settings/etl_fast.yml
+++ b/src/pudl/package_data/settings/etl_fast.yml
@@ -79,6 +79,7 @@ datasets:
           2020,
           2021,
           2022,
+          2023,
         ]
     eia930:
       half_years: ["2024half2"]
diff --git a/src/pudl/package_data/settings/etl_full.yml b/src/pudl/package_data/settings/etl_full.yml
index cf6e04fdac..b06ebaf17f 100644
--- a/src/pudl/package_data/settings/etl_full.yml
+++ b/src/pudl/package_data/settings/etl_full.yml
@@ -307,6 +307,7 @@ datasets:
           2020,
           2021,
           2022,
+          2023,
         ]
     eia930:
       half_years: ["all"]
diff --git a/src/pudl/transform/eia861.py b/src/pudl/transform/eia861.py
index 983f9c3958..c96dff24a7 100644
--- a/src/pudl/transform/eia861.py
+++ b/src/pudl/transform/eia861.py
@@ -840,20 +840,21 @@ def _compare_totals(data_cols, idx_cols, class_type, df_name):
 
 
 def clean_nerc(df: pd.DataFrame, idx_cols: list[str]) -> pd.DataFrame:
-    """Clean NERC region entries and make new rows for multiple nercs.
+    """Clean NERC region entries.
 
     This function examines reported NERC regions and makes sure the output column of the
     same name has reliable, singular NERC region acronyms. To do so, this function
     identifies entries where there are two or more NERC regions specified in a single
-    cell (such as SPP & ERCOT) and makes new, duplicate rows for each NERC region. It
-    also converts non-recognized reported nerc regions to 'UNK'.
+    cell (such as SPP & ERCOT) and makes a standardized hybrid entry separated by an
+    underscore (e.g., FRCC_SERC). It also converts non-recognized reported NERC regions
+    to 'UNK'.
 
     Args:
         df: A DataFrame with the column 'nerc_region' to be cleaned.
         idx_cols: A list of the primary keys and `nerc_region`.
 
     Returns:
-        A DataFrame with correct and clean nerc regions.
+        A DataFrame with correct and clean NERC regions.
     """
     idx_no_nerc = idx_cols.copy()
     if "nerc_region" in idx_no_nerc:
diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py
index 04112cf2dd..81a9bd6ee1 100644
--- a/src/pudl/workspace/datastore.py
+++ b/src/pudl/workspace/datastore.py
@@ -192,7 +192,7 @@ class ZenodoDoiSettings(BaseSettings):
     eia757a: ZenodoDoi = "10.5281/zenodo.10607839"
     eia860: ZenodoDoi = "10.5281/zenodo.13682785"
     eia860m: ZenodoDoi = "10.5281/zenodo.12656895"
-    eia861: ZenodoDoi = "10.5281/zenodo.10204708"
+    eia861: ZenodoDoi = "10.5281/zenodo.13907096"
     eia923: ZenodoDoi = "10.5281/zenodo.13884405"
     eia930: ZenodoDoi = "10.5281/zenodo.13149087"
     eiawater: ZenodoDoi = "10.5281/zenodo.10806016"
diff --git a/test/validate/service_territory_test.py b/test/validate/service_territory_test.py
index a0f0d53446..f3b9ae514a 100644
--- a/test/validate/service_territory_test.py
+++ b/test/validate/service_territory_test.py
@@ -16,9 +16,9 @@
     "df_name,expected_rows",
     [
         ("summarized_demand_ferc714", 3_924),
-        ("fipsified_respondents_ferc714", 156_392),
-        ("compiled_geometry_balancing_authority_eia861", 113_142),
-        ("compiled_geometry_utility_eia861", 256_949),
+        ("fipsified_respondents_ferc714", 165_131),
+        ("compiled_geometry_balancing_authority_eia861", 117_577),
+        ("compiled_geometry_utility_eia861", 268_665),
     ],
 )
 def test_minmax_rows(
diff --git a/test/validate/state_demand_test.py b/test/validate/state_demand_test.py
index d48cf4709d..c4ac4e1b4a 100644
--- a/test/validate/state_demand_test.py
+++ b/test/validate/state_demand_test.py
@@ -12,7 +12,7 @@
 
 @pytest.mark.parametrize(
     "resource_id,expected_rows",
-    [("out_ferc714__hourly_estimated_state_demand", 7_599_842)],
+    [("out_ferc714__hourly_estimated_state_demand", 8_046_602)],
 )
 def test_minmax_rows(live_dbs: bool, resource_id: str, expected_rows: int):
     """Verify that output DataFrames don't have too many or too few rows.