diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/.modelkit-config b/commercial measures/SWHC046-06 Pkg HP AC Com/.modelkit-config
new file mode 100644
index 000000000..b11027e50
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/.modelkit-config	
@@ -0,0 +1,24 @@
+
+# Paths are expanded relative to this modelkit-config file.
+
+prototypes-dir = '../../prototypes'
+templates-dir = '../../templates/energyplus/templates'
+weather-dir = '../../weather'
+codes-dir = '../../codes'
+
+max-workers = 12  # Maximum number of simulations to run in parallel
+
+
+[template-compose]
+annotate = true
+indent = "    "
+esc-line = "! "
+dirs = '~\Documents\Modelkit Caboodle\templates\energyplus\templates'  # Must be an absolute path
+
+[energyplus-run]
+engine = 'C:\EnergyPlusV22-2-0'  # Must be an absolute path
+#engine = '/Applications/EnergyPlus-22-2-0'  # Must be an absolute path
+#engine = '/Applications/EnergyPlus-9-2-0'  # Must be an absolute path
+readvars = true
+keep = false
+output-files = "eplusout.err; eplusout.sql; eplustbl.htm; eplusvar.csv"
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/DEER_EnergyPlus_Modelkit_Measure_list_working.xlsx b/commercial measures/SWHC046-06 Pkg HP AC Com/DEER_EnergyPlus_Modelkit_Measure_list_working.xlsx
new file mode 100644
index 000000000..d51a63e99
Binary files /dev/null and b/commercial measures/SWHC046-06 Pkg HP AC Com/DEER_EnergyPlus_Modelkit_Measure_list_working.xlsx differ
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/README.md b/commercial measures/SWHC046-06 Pkg HP AC Com/README.md
new file mode 100644
index 000000000..bbac24a5d
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/README.md	
@@ -0,0 +1,126 @@
+# Steps to run simulations, gather outputs, and post-process results for this measure
+
+Note if `result2.py` is not present, see https://github.com/sound-data/DEER-Prototypes-EnergyPlus/pull/65.
+
+```
+REM In command prompt, change directory to a clone of the repository. You may have a different path.
+cd "C:/DEER-Prototypes-EnergyPlus"
+```
+
+## 1. Run simulations and generate output files
+
+### 1.1. Run simulations
+
+```
+cd "commercial measures/SWHC046-04 Pkg HP AC Com/SWHC046-04 Pkg HP AC Com_Ex"
+modelkit rake compose
+REM For large number of simulations, rakefile may fail to gather results, so just run simulations.
+modelkit rake run
+```
+
+Then, repeat for subfolder `SWHC046-04 Pkg HP AC Com_Htl_Ex`.
+
+Optionally, while `modelkit rake run` is running, use how-to-track-progress.py to see a progress bar.
+
+Optionally, after model runs are complete, use
+[QC incomplete simulations.ipynb](https://github.com/simularis/building-energy-utils/blob/main/deer-user-scripts/QC%20incomplete%20simulations.ipynb)
+to get statistics on failed simulations and a count of warning and error messages from EnergyPlus.
+
+### 1.2. Gather summary output files for raw usage and QC
+
+#### Generate results-summary.csv (using standard query file, for use with post-process scripts) 
+
+Option 1 (using modelkit). If option 1 fails, try option 2.
+
+```
+modelkit rake results
+```
+
+Option 2 (using equivalent python script)
+
+```
+cd "commercial measures/SWHC046-04 Pkg HP AC Com/SWHC046-04 Pkg HP AC Com_Ex"
+python "../../../scripts/result.py" . --queryfile "query.txt" --detailfile results-sizing-detail.csv --aggfile results-summary.csv
+```
+
+Note that the python script has a side effect of outputting a file with disaggregated quantities for any query items that represent aggregate totals, such as cooling capacity of all coils.
+
+Repeat for each subfolder (`SWHC046-04 Pkg HP AC Com_Ex` and `SWHC046-04 Pkg HP AC Com_Htl_Ex`).
+
+#### Generate customized simdata.csv
+
+```
+cd "commercial measures/SWHC046-04 Pkg HP AC Com/"
+python "result2.py" . --queryfile "query_SWHC046_QC.txt"
+```
+
+The dot represents the current directory. This script runs outside the vintage subfolders, so only run this script once.
+
+Use simdata.csv to perform QC, calculate UEC for all categories of load, and obtain DEER Peak Demand results bypassing the post-processing tool.
+
+## 2. Determine cooling capacity subject to measure
+
+### 2.1. Extract cooling capacity from every coil in model
+
+Extract results to results-sizing-detail.csv
+
+```
+cd "commercial measures/SWHC046-04 Pkg HP AC Com/SWHC046-04 Pkg HP AC Com_Ex"
+python "../../../scripts/result.py" . --queryfile "query_SWHC046_sizing.txt" --detailfile results-sizing-detail.csv --aggfile results-sizing-agg.csv
+```
+
+Repeat for each vintage subfolder "SWHC046-04 Pkg HP AC Com_Htl_Ex".
+
+### 2.2. Filter cooling capacity
+
+Filter and aggregate results into sizing_agg_filtered.csv. Note that this step depends on the file coil_list.xlsx being in the same folder as the script.
+
+```
+cd "commercial measures/SWHC046-04 Pkg HP AC Com"
+python result_filtered.py
+```
+
+## 3. Apply post-processing for commercial sector weighted average (with normalizing units from models)
+
+For commercial sector weighted averages, post-process according to instructions in [../../scripts](../../scripts). The command line steps include:
+
+### 3.1 Run data transformation script to get current_msr_mat, sim_annual, and sim_hourly_wb
+
+First, copy the DEER_EnergyPlus_Modelkit_Measure_list workbook from this folder into "C:/DEER-Prototypes-EnergyPlus/scripts/data transformation". Then, follow the standard procedures for data transformation per instructions in [../../scripts](../../scripts).
+
+```
+cd "C:/DEER-Prototypes-EnergyPlus"
+cd "scripts/data transformation"
+REM Generate current_msr_mat.csv, sim_annual.csv, and sim_hourly_wb.csv.
+python Com.py
+REM Optionally, copy the outputs to the measure folder
+copy "current_msr_mat.csv" "commercial measures/SWHC046-04 Pkg HP AC Com"
+copy "sim_annual.csv" "commercial measures/SWHC046-04 Pkg HP AC Com"
+copy "sim_hourly_wb.csv" "commercial measures/SWHC046-04 Pkg HP AC Com"
+```
+
+### 3.2. Insert results from cooling capacity into sim_annual
+
+The script insert_normunits.py inserts results from sizing_agg_filtered.csv into a copy of sim_annual.csv and saves it to sim_annual_withunits.csv. The command line pattern for this script is:
+
+```
+python insert_normunits.py <sizing_column> <normunit> <conversion_factor> <measure_name>
+```
+
+For this measure the options are
+- `<sizing_column>` = "Cooling Capacity (W)"
+- `<normunit>` = Cap-Tons
+- `<conversion_factor>` = (W thermal / 1 ton cooling) = 1 / 3516.85284 = 2.84345e-4
+- `<measure_name>` = "Pkg HP AC Com"
+
+First copy the sizing_agg_filtered.csv into the scripts folder. Then run the script:
+
+```
+python insert_normunits.py "Cooling Capacity (W)" Cap-Tons 2.84345e-4 "Pkg HP AC Com"
+```
+
+At this point, you should have an updated copy of sim_annual.csv with cooling capacity in the normalizing units column.
+
+### 3.3. Run commercial post-processing script
+
+Refer to standard instructions in [../../scripts](../../scripts). Use the file "sim_annual_withunits.xlsx" in place of the "sim_annual.csv" file from Com.py.
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Asm&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Asm&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Asm&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/ECC&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/ECC&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/ECC&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/EPr&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/EPr&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/EPr&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/ERC&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/ERC&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/ERC&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/ESe&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/ESe&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/ESe&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/EUn&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/EUn&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/EUn&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Gro&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Gro&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Gro&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Hsp&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Hsp&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Hsp&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/MBT&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/MBT&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/MBT&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/MLI&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/MLI&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/MLI&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Mtl&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Mtl&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Mtl&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Nrs&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Nrs&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Nrs&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/OfL&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/OfL&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/OfL&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/OfS&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/OfS&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/OfS&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RFF&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RFF&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RFF&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RSD&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RSD&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RSD&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Rt3&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Rt3&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/Rt3&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RtL&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RtL&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RtL&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RtS&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RtS&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/RtS&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/SCn&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/SCn&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/SCn&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/cDXHP.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/cDXHP.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/cDXHP.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/cDXHP_VarFan.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/cDXHP_VarFan.csv
new file mode 100644
index 000000000..63e580697
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/cDXHP_VarFan.csv	
@@ -0,0 +1,27 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2-VarFan,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,VARIABLE,0.87,,0.81,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/create_hvac_copies.cmd b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/create_hvac_copies.cmd
new file mode 100644
index 000000000..70cf7b3ad
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/create_hvac_copies.cmd	
@@ -0,0 +1,9 @@
+copy cDXHP.csv "Asm&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP.csv "Hsp&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP.csv "MBT&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP.csv "MLI&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP.csv "Mtl&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP.csv "Nrs&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP.csv "RFF&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP.csv "RSD&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP.csv "SCn&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
\ No newline at end of file
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/create_hvac_copies_VarFan.cmd b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/create_hvac_copies_VarFan.cmd
new file mode 100644
index 000000000..a9bc3eb59
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cases/create_hvac_copies_VarFan.cmd	
@@ -0,0 +1,11 @@
+copy cDXHP_VarFan.csv "ECC&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "EPr&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "ERC&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "ESe&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "EUn&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "Gro&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "OfL&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "OfS&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "Rt3&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "RtL&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
+copy cDXHP_VarFan.csv "RtS&0&cDXHP&Ex&dxHP_equip__pkgEER.csv"
\ No newline at end of file
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/climates.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/climates.csv
new file mode 100644
index 000000000..2b7ad0aa4
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/climates.csv	
@@ -0,0 +1,17 @@
+skip,climate,weather_file,climate_zone,codes_file
+,CZ01,CA_EUREKA_725940S_CZ2022.epw,1,T24_weight_averaged_ex.csv
+,CZ02,CA_NAPA-CO_724955S_CZ2022.epw,2,T24_weight_averaged_ex.csv
+,CZ03,CA_OAKLAND-METRO-AP_724930S_CZ2022.epw,3,T24_weight_averaged_ex.csv
+,CZ04,CA_SAN-JOSE-IAP_724945S_CZ2022.epw,4,T24_weight_averaged_ex.csv
+,CZ05,CA_SANTA-MARIA-PUBLIC-AP_723940S_CZ2022.epw,5,T24_weight_averaged_ex.csv
+,CZ06,CA_LOS-ANGELES-IAP_722950S_CZ2022.epw,6,T24_weight_averaged_ex.csv
+,CZ07,CA_SAN-DIEGO-LINDBERGH-FLD_722900S_CZ2022.epw,7,T24_weight_averaged_ex.csv
+,CZ08,CA_LONG-BEACH-DAUGHERTY-FLD_722970S_CZ2022.epw,8,T24_weight_averaged_ex.csv
+,CZ09,CA_LOS-ANGELES-DOWNTOWN-USC_722874S_CZ2022.epw,9,T24_weight_averaged_ex.csv
+,CZ10,CA_RIVERSIDE-MUNI_722869S_CZ2022.epw,10,T24_weight_averaged_ex.csv
+,CZ11,CA_RED-BLUFF-MUNI-AP_725910S_CZ2022.epw,11,T24_weight_averaged_ex.csv
+,CZ12,CA_STOCKTON-METRO-AP_724920S_CZ2022.epw,12,T24_weight_averaged_ex.csv
+,CZ13,CA_FRESNO-YOSEMITE-IAP_723890S_CZ2022.epw,13,T24_weight_averaged_ex.csv
+,CZ14,CA_DAGGETT-BARSTOW-AP_723815S_CZ2022.epw,14,T24_weight_averaged_ex.csv
+,CZ15,CA_EL-CENTRO-NAF_722810S_CZ2022.epw,15,T24_weight_averaged_ex.csv
+,CZ16,CA_BISHOP-AP_724800S_CZ2022.epw,16,T24_weight_averaged_ex.csv
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cohorts.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cohorts.csv
new file mode 100644
index 000000000..26a0837ed
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/cohorts.csv	
@@ -0,0 +1,26 @@
+skip,cohort,root,wall_type,:wall_base_cavity_insul,:wall_base_cont_insul,:roof_base_cont_insul,:window_u,:window_shgc,:window_transmittance,:floor_base_cont_insul,:office_large_light_area,:kitchen_light_area,:dining_fast_light_area,:classroom_class_light_area,:corridor_light_area,:retail_sales_light_area,:storage_warehouse_light_area,:computer_light_area,:lobby_light_area,:guestroom_light_area,:auditorium_light_area,:conference_light_area,:dining_fine_light_area,:gym_light_area,:restroom_light_area,:health_patient_light_area,:industrial_low_light_area,:laundry_light_area,:auto_light_area,:classroom_shop_light_area,:grocery_light_area,:health_operating_light_area,:industrial_high_light_area,:lab_light_area,:mech_light_area,:office_open_light_area,:storage_refrig_light_area,:office_small_light_area
+,Asm&0&cDXHP&Ex&dxHP_equip__pkgEER,Asm/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""auditorium"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,
+,ECC&0&cDXHP&Ex&dxHP_equip__pkgEER,ECC/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""classroom_shop"", ""LPD"")['W/ft2']",,,,,,,,
+,EPr&0&cDXHP&Ex&dxHP_equip__pkgEER,EPr/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""gym"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,
+,ERC&0&cDXHP&Ex&dxHP_equip__pkgEER,ERC/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,"%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,,
+,ESe&0&cDXHP&Ex&dxHP_equip__pkgEER,ESe/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""gym"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,
+,EUn&0&cDXHP&Ex&dxHP_equip__pkgEER,EUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""guestroom"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""industrial_low"", ""LPD"")['W/ft2']",,,,,,,,,,,
+#,Fin&0&cDXHP&Ex&dxHP_equip__pkgEER,Fin/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,
+,Gro&0&cDXHP&Ex&dxHP_equip__pkgEER,Gro/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""grocery"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""industrial_high"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""storage_refrig"", ""LPD"")['W/ft2']",
+,Hsp&0&cDXHP&Ex&dxHP_equip__pkgEER,Hsp/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""health_patient"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""health_operating"", ""LPD"")['W/ft2']",,,,,,
+#,Htl&0&cDXHP&Ex&dxHP_equip__pkgEER,Htl/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""guestroom"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""dining_fine"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Lighting Power Density"", ""laundry"", ""LPD"")['W/ft2']",,,,,,,,,,
+#,Lib&0&cDXHP&Ex&dxHP_equip__pkgEER,Lib/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""conference"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,
+,MBT&0&cDXHP&Ex&dxHP_equip__pkgEER,MBT/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""conference"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""lab"", ""LPD"")['W/ft2']",,,,
+,MLI&0&cDXHP&Ex&dxHP_equip__pkgEER,MLI/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""industrial_low"", ""LPD"")['W/ft2']",,,,,,,,,,,
+,Mtl&0&cDXHP&Ex&dxHP_equip__pkgEER,Mtl/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Lighting Power Density"", ""guestroom"", ""LPD"")['W/ft2']",,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""laundry"", ""LPD"")['W/ft2']",,,,,,,,,,
+,Nrs&0&cDXHP&Ex&dxHP_equip__pkgEER,Nrs/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""health_patient"", ""LPD"")['W/ft2']",,,,,,,,,,,,
+,OfL&0&cDXHP&Ex&dxHP_equip__pkgEER,OfL/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""mech"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""office_open"", ""LPD"")['W/ft2']",,
+,OfS&0&cDXHP&Ex&dxHP_equip__pkgEER,OfS/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""office_small"", ""LPD"")['W/ft2']"
+#,Rel&0&cDXHP&Ex&dxHP_equip__pkgEER,Rel/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""auditorium"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,
+,RFF&0&cDXHP&Ex&dxHP_equip__pkgEER,RFF/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""restroom"", ""LPD"")['W/ft2']",,,,,,,,,,,,,
+,RSD&0&cDXHP&Ex&dxHP_equip__pkgEER,RSD/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""dining_fine"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""restroom"", ""LPD"")['W/ft2']",,,,,,,,,,,,,
+,Rt3&0&cDXHP&Ex&dxHP_equip__pkgEER,Rt3/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,
+,RtL&0&cDXHP&Ex&dxHP_equip__pkgEER,RtL/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""auto"", ""LPD"")['W/ft2']",,,,,,,,,
+,RtS&0&cDXHP&Ex&dxHP_equip__pkgEER,RtS/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,
+,SCn&0&cDXHP&Ex&dxHP_equip__pkgEER,SCn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,
+#,SUn&0&cDXHP&Ex&dxHP_equip__pkgEER,SUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/query.txt b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/query.txt
new file mode 100644
index 000000000..f16ea16af
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/query.txt	
@@ -0,0 +1,32 @@
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Site Energy, Net Site EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Site Energy, Net Site Energy
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Source Energy, Net Source EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Source Energy, Net Source Energy
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Total End Uses, Total
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heating, Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Cooling, Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Lighting, Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Lighting, Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Equipment, Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Equipment, Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Fans, Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Pumps, Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Recovery, Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Water Systems, Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Refrigeration, Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Generators, Generators
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heating, Heating Elec
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Cooling, Cooling Elec
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heating, Heating NG
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Cooling, Cooling NG
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Interior Equipment, Interior Equipment Elec
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Interior Equipment, Interior Equipment NG
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Total End Uses, Electricity
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Total End Uses, Natural Gas
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Heating, Unmet Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Cooling, Unmet Cooling
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/query_SWHC046_sizing.txt b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/query_SWHC046_sizing.txt
new file mode 100644
index 000000000..d280a78a1
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Ex/query_SWHC046_sizing.txt	
@@ -0,0 +1 @@
+ComponentSizingSummary/Entire Facility/AirLoopHVAC:UnitarySystem/Design Size Nominal Cooling Capacity/*, Unitary Nominal Cooling Capacity [W]
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/cases/Htl&0&cDXHP&Ex&dxHP_equip__pkgEER.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/cases/Htl&0&cDXHP&Ex&dxHP_equip__pkgEER.csv
new file mode 100644
index 000000000..ca8baf9bf
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/cases/Htl&0&cDXHP&Ex&dxHP_equip__pkgEER.csv	
@@ -0,0 +1,23 @@
+skip,case_name,sizing_case,:heat_sizing_factor,:cool_sizing_factor,:hvac_config,:main_hvac_type,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_cool_coil_type,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:chw_chiller_cop,:chw_chiller_model,:chw_pump_type,:hw_boiler_eff
+,NE-dxAC_equip-pkgEER-14.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-13.2-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.74,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-14.8-IEER-TE-0.81,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.07,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgSEER-13.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.82,CONSTANT,,,CONSTANT,0.87,,0.81,1,,,,
+,NE-dxAC_equip-pkgEER-12.2-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.6,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-11.4-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.36,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgEER-12.7-IEER-TE-0.80,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.59,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxAC_equip-pkgSEER-12.35-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,COMBUSTION,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.65,CONSTANT,,,CONSTANT,0.87,,0.8,1,,,,
+,NE-dxHP_equip-pkgEER-14.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.95,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-13.5-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.8,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-14-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,3.91,CONSTANT,,,CONSTANT,0.87,3.4,,1,,,,
+,NE-dxHP_equip-pkgEER-15-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.11,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgEER-16-IEER,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.34,CONSTANT,,,CONSTANT,0.87,3.61,,1,,,,
+,NE-dxHP_equip-pkgSEER-15.4-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,3.93,,1,,,,
+,NE-dxHP_equip-pkgSEER-16.3-SEER2,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-1Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-pkgSEER-14.4-SEER2-2Stage,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,DUAL-EQUAL,,,CONSTANT,0.87,3.86,,1,,,,
+,NE-dxHP_equip-spltSEER-14.4-SEER2-8.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.12,CONSTANT,,,CONSTANT,0.87,3.97,,1,,,,
+,NE-dxHP_equip-spltSEER-15.4-SEER2-9-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.27,CONSTANT,,,CONSTANT,0.87,4.02,,1,,,,
+,NE-dxHP_equip-spltSEER-16.3-SEER2-9.4-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.43,CONSTANT,,,CONSTANT,0.87,4.09,,1,,,,
+,NE-dxHP_equip-spltSEER-17.3-SEER2-9.7-HSPF,,1.25,1.15,,SZ-CAV,NONE,nil,3.877['in H2O'],DX-AIR,DX-AIR,PNNL,FLOATING,95['F'],NONCOINCIDENT,FIXED-DRY-BULB,4.56,CONSTANT,,,CONSTANT,0.87,4.13,,1,,,,
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/climates.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/climates.csv
new file mode 100644
index 000000000..9f5cc7a84
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/climates.csv	
@@ -0,0 +1,17 @@
+skip,climate,weather_file,climate_zone,codes_file
+,CZ01,CA_EUREKA_725940S_CZ2022.epw,1,T24_weight_averaged_ex_Htl.csv
+,CZ02,CA_NAPA-CO_724955S_CZ2022.epw,2,T24_weight_averaged_ex_Htl.csv
+,CZ03,CA_OAKLAND-METRO-AP_724930S_CZ2022.epw,3,T24_weight_averaged_ex_Htl.csv
+,CZ04,CA_SAN-JOSE-IAP_724945S_CZ2022.epw,4,T24_weight_averaged_ex_Htl.csv
+,CZ05,CA_SANTA-MARIA-PUBLIC-AP_723940S_CZ2022.epw,5,T24_weight_averaged_ex_Htl.csv
+,CZ06,CA_LOS-ANGELES-IAP_722950S_CZ2022.epw,6,T24_weight_averaged_ex_Htl.csv
+,CZ07,CA_SAN-DIEGO-LINDBERGH-FLD_722900S_CZ2022.epw,7,T24_weight_averaged_ex_Htl.csv
+,CZ08,CA_LONG-BEACH-DAUGHERTY-FLD_722970S_CZ2022.epw,8,T24_weight_averaged_ex_Htl.csv
+,CZ09,CA_LOS-ANGELES-DOWNTOWN-USC_722874S_CZ2022.epw,9,T24_weight_averaged_ex_Htl.csv
+,CZ10,CA_RIVERSIDE-MUNI_722869S_CZ2022.epw,10,T24_weight_averaged_ex_Htl.csv
+,CZ11,CA_RED-BLUFF-MUNI-AP_725910S_CZ2022.epw,11,T24_weight_averaged_ex_Htl.csv
+,CZ12,CA_STOCKTON-METRO-AP_724920S_CZ2022.epw,12,T24_weight_averaged_ex_Htl.csv
+,CZ13,CA_FRESNO-YOSEMITE-IAP_723890S_CZ2022.epw,13,T24_weight_averaged_ex_Htl.csv
+,CZ14,CA_DAGGETT-BARSTOW-AP_723815S_CZ2022.epw,14,T24_weight_averaged_ex_Htl.csv
+,CZ15,CA_EL-CENTRO-NAF_722810S_CZ2022.epw,15,T24_weight_averaged_ex_Htl.csv
+,CZ16,CA_BISHOP-AP_724800S_CZ2022.epw,16,T24_weight_averaged_ex_Htl.csv
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/cohorts.csv b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/cohorts.csv
new file mode 100644
index 000000000..7dd314cae
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/cohorts.csv	
@@ -0,0 +1,26 @@
+skip,cohort,root,wall_type,:wall_base_cavity_insul,:wall_base_cont_insul,:roof_base_cont_insul,:window_u,:window_shgc,:window_transmittance,:floor_base_cont_insul
+#,Asm&0&cDXHP&Ex&dxHP_equip__pkgEER,Asm/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,ECC&0&cDXHP&Ex&dxHP_equip__pkgEER,ECC/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,EPr&0&cDXHP&Ex&dxHP_equip__pkgEER,EPr/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,ERC&0&cDXHP&Ex&dxHP_equip__pkgEER,ERC/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,ESe&0&cDXHP&Ex&dxHP_equip__pkgEER,ESe/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,EUn&0&cDXHP&Ex&dxHP_equip__pkgEER,EUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,Fin&0&cDXHP&Ex&dxHP_equip__pkgEER,Fin/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,Gro&0&cDXHP&Ex&dxHP_equip__pkgEER,Gro/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,Hsp&0&cDXHP&Ex&dxHP_equip__pkgEER,Hsp/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+,Htl&0&cDXHP&Ex&dxHP_equip__pkgEER,Htl/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,Lib&0&cDXHP&Ex&dxHP_equip__pkgEER,Lib/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,MBT&0&cDXHP&Ex&dxHP_equip__pkgEER,MBT/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,MLI&0&cDXHP&Ex&dxHP_equip__pkgEER,MLI/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,Mtl&0&cDXHP&Ex&dxHP_equip__pkgEER,Mtl/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,Nrs&0&cDXHP&Ex&dxHP_equip__pkgEER,Nrs/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,OfL&0&cDXHP&Ex&dxHP_equip__pkgEER,OfL/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,OfS&0&cDXHP&Ex&dxHP_equip__pkgEER,OfS/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,Rel&0&cDXHP&Ex&dxHP_equip__pkgEER,Rel/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,RFF&0&cDXHP&Ex&dxHP_equip__pkgEER,RFF/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,RSD&0&cDXHP&Ex&dxHP_equip__pkgEER,RSD/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,Rt3&0&cDXHP&Ex&dxHP_equip__pkgEER,Rt3/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,RtL&0&cDXHP&Ex&dxHP_equip__pkgEER,RtL/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,RtS&0&cDXHP&Ex&dxHP_equip__pkgEER,RtS/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,SCn&0&cDXHP&Ex&dxHP_equip__pkgEER,SCn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
+#,SUn&0&cDXHP&Ex&dxHP_equip__pkgEER,SUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']"
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/query.txt b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/query.txt
new file mode 100644
index 000000000..f16ea16af
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/query.txt	
@@ -0,0 +1,32 @@
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Site Energy, Net Site EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Site Energy, Net Site Energy
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Source Energy, Net Source EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Source Energy, Net Source Energy
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Total End Uses, Total
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heating, Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Cooling, Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Lighting, Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Lighting, Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Equipment, Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Equipment, Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Fans, Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Pumps, Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Recovery, Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Water Systems, Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Refrigeration, Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Generators, Generators
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heating, Heating Elec
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Cooling, Cooling Elec
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heating, Heating NG
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Cooling, Cooling NG
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Interior Equipment, Interior Equipment Elec
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Interior Equipment, Interior Equipment NG
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Total End Uses, Electricity
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Total End Uses, Natural Gas
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Heating, Unmet Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Cooling, Unmet Cooling
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/query_SWHC046_sizing.txt b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/query_SWHC046_sizing.txt
new file mode 100644
index 000000000..d280a78a1
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/SWHC046-06 Pkg HP AC Com_Htl_Ex/query_SWHC046_sizing.txt	
@@ -0,0 +1 @@
+ComponentSizingSummary/Entire Facility/AirLoopHVAC:UnitarySystem/Design Size Nominal Cooling Capacity/*, Unitary Nominal Cooling Capacity [W]
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/coil_list.xlsx b/commercial measures/SWHC046-06 Pkg HP AC Com/coil_list.xlsx
new file mode 100644
index 000000000..e8ab2688e
Binary files /dev/null and b/commercial measures/SWHC046-06 Pkg HP AC Com/coil_list.xlsx differ
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/global.pxv b/commercial measures/SWHC046-06 Pkg HP AC Com/global.pxv
new file mode 100644
index 000000000..c707bb604
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/global.pxv	
@@ -0,0 +1,2 @@
+:timestep => 6,
+:run_control => "ANNUAL"  # ANNUAL | SIZING
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/how-to-use-results2py.cmd b/commercial measures/SWHC046-06 Pkg HP AC Com/how-to-use-results2py.cmd
new file mode 100644
index 000000000..9a30595f7
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/how-to-use-results2py.cmd	
@@ -0,0 +1,4 @@
+REM Change directory to your measure folder then run this script.
+REM E:
+REM cd E:\SWHC046\commercial measures\SWHC046-04 Pkg HP AC Com
+python E:\deerpeak-query-tool\scripts\result2.py -q E:\deerpeak-query-tool\querylibrary\query_benchmark.txt
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/postgres-com-swhc046.psql b/commercial measures/SWHC046-06 Pkg HP AC Com/postgres-com-swhc046.psql
new file mode 100644
index 000000000..69ba949e9
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/postgres-com-swhc046.psql	
@@ -0,0 +1,146 @@
+/*
+postgres-template-com.psql
+Nicholas Fette, created 2023-01-05, modified 2025-09-28
+
+Automate DEER weighted average processing workflow in PostgreSQL:
+Set up support tables, import results data , and run all the post-processing scripts.
+Warning: deletes the results data currently in the designated database schema.
+
+Setup steps:
+  Copy the template to your measure folder and rename the file,
+  e.g. "commercial measures/SWHC012/postgres-com-SWHC012.psql".
+  Edit import statements to import each file from data transformation steps.
+  For any customizations such as importing and updating results from additional data sources,
+  document modifications with a comment.
+
+Usage on command line (substitute your measure folder for SWXX000)
+  cd "C:/DEER-Prototypes-EnergyPlus/commercial measures/SWXX000"
+  psql -d "postgres" -U "postgres" -f "postgres-com-SWXX000.psql"
+
+Substitute the database name (-d) and user name (-U) based on your installation settings.
+
+If psql is not recognized, you may need to configure the PATH.
+After installing one of pgAdmin, dbeaver, or postgresql for example:
+  set "path=%PATH%;%LOCALAPPDATA%\Programs\pgAdmin 4\v6\runtime"
+  set "path=%PATH%;C:\Program Files\PostgreSQL\15\bin"
+
+Within an open interactive psql session:
+  \cd 'C:/DEER-Prototypes-EnergyPlus/commercial measures/SWXX000/'
+  \i postgres-com-SWXX000.psql
+
+*/
+
+\set ON_ERROR_STOP on
+--\set ECHO all
+-- Formatting control codes 
+\set H0 '\033[0m'
+\set H1 '\n\033[4;1m'
+\set H2 '\033[1m--'
+\set H3 '\033[3;32m'
+
+-- Set folder paths for this PSQL session.
+-- Folder paths may be absolute or relative to this script.
+\set DEERROOT '../../'
+--\set DEERROOT 'C:/DEER2026/dev-SWHC046-VarFan/'
+-- These commands build folder path strings by concatenating previously defined variables. 
+\set SCRIPTS :DEERROOT 'scripts/'
+\set SCHEMAFILES :SCRIPTS 'energy savings/commercial/support_and_setup_tables/'
+\set ENERGYSAVINGSCOM :SCRIPTS 'energy savings/commercial/'
+\set STUDY 'results/'
+\set SCHEMANAME 'MC_results_database'
+\echo 'Assuming scripts are located in ' :'ENERGYSAVINGSCOM'
+\echo 'Assuming measure results are located in subfolders of ' :'STUDY'
+\echo 'Assuming schema name ' :'SCHEMANAME'
+
+\echo :H1'[0/7] Creating the schema and set search path.':H0
+CREATE SCHEMA IF NOT EXISTS :"SCHEMANAME";
+SET search_path TO :"SCHEMANAME";
+
+\echo :H1'[1/7] Loading support tables':H0
+
+-- Note that PSQL commands with a filename as an argument, like \copy and \i,
+-- have some limitations and the following can cause errors:
+--   Passing a file path variable containing spaces.
+--   Attempting to concatenate two strings into a filename within the body of the command.
+-- To get around this limitation and to support debugging, we can define the
+-- filename or the entire command including its arguments as a variable, echo
+-- it for debugging, and then execute it.   
+
+\echo :H2'Support table peakperspec':H0
+\set file :SCHEMAFILES 'create_peakperspec.sql' \set command '\\i ' :'file'
+\echo :H3:command:H0
+:command
+truncate "peakperspec";
+\set file :ENERGYSAVINGSCOM 'peakperspec.csv'
+\set command '\\copy "peakperspec" FROM ' :'file' ' WITH (FORMAT csv, HEADER MATCH)'
+\echo :H3:command:H0
+:command
+
+\echo :H2'Support table wts_com_bldg':H0
+\set file :SCHEMAFILES 'create_wts_com_bldg.sql' \set command '\\i ' :'file' 
+\echo :H3:command:H0
+:command
+truncate "wts_com_bldg";
+\set file :ENERGYSAVINGSCOM 'wts_com_bldg.csv'
+\set command '\\copy "wts_com_bldg" FROM ' :'file' ' WITH (FORMAT csv, HEADER MATCH)'
+\echo :H3:command:H0
+:command
+
+\echo :H1'[2/7] Creating placeholder tables for imported data':H0
+
+\set file :SCHEMAFILES 'create_current_msr_mat.sql' \set command '\\i ' :'file'
+\echo :H3:command:H0
+:command
+\set file :SCHEMAFILES 'create_sim_annual.sql' \set command '\\i ' :'file'
+\echo :H3:command:H0
+:command
+\set file :SCHEMAFILES 'create_sim_hourly_wb.sql' \set command '\\i ' :'file'
+\echo :H3:command:H0
+:command
+
+\echo :H1'[3/7] Importing data files generated by Com.py':H0
+
+\echo :H2'Import current_msr_mat':H0
+truncate "current_msr_mat";
+\set file :STUDY 'current_msr_mat.csv'
+\set command '\\copy "current_msr_mat" FROM ' :'file' ' WITH (FORMAT csv, HEADER MATCH)'
+\echo :H3:command:H0
+:command
+
+\echo :H2'Import sim_annual':H0
+truncate "sim_annual";
+\set file :STUDY 'sim_annual.csv'
+\set command '\\copy "sim_annual" FROM ' :'file' ' WITH (FORMAT csv, HEADER MATCH)'
+\echo :H3:command:H0
+:command
+
+\echo :H2'Import sim_hourly_wb':H0
+/*
+truncate "sim_hourly_wb";
+\set file :STUDY 'sim_hourly_wb.csv'
+\set command '\\copy "sim_hourly_wb" FROM ' :'file' ' WITH (FORMAT csv, HEADER MATCH)'
+\echo :H3:command:H0
+:command
+*/
+
+\echo :H1'[4/7] Computing peak demand from hourly data':H0
+
+\echo :H2'Run script P1':H0
+\set file :ENERGYSAVINGSCOM 'P1-Create-sim_peakper_2023.sql' \i :file
+
+\echo :H1'[5/7] Calculating measure energy impacts':H0
+
+\echo :H2'Run script P2 (merge base case and measure case, normalize)':H0
+\set file :ENERGYSAVINGSCOM 'P2-Calc_MsrImpacts_2023.sql' \i :file
+\echo :H2'Run script P3 (sector weighted average, step 1 of 2)':H0
+\set file :ENERGYSAVINGSCOM 'P3-Bldg_wt_Mult.sql' \i :file
+\echo :H2'Run script P4 (sector weighted average, step 2 of 2)':H0
+\set file :ENERGYSAVINGSCOM 'P4-SumBldg.sql' \i :file
+\echo :H2'Run script P5 (rounding)':H0
+\set file :ENERGYSAVINGSCOM 'P5-roundDEER.sql' \i :file
+
+\echo :H1'[6/7] Writing output files':H0
+\echo :H2'Write file meas_impacts_2024_com.csv (in the current directory).':H0
+\copy "meas_impacts_2024_com" to 'meas_impacts_2024_com.csv' WITH (FORMAT csv, HEADER)
+
+\echo :H1'[7/7] Done':H0
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/query_SWHC046_QC.txt b/commercial measures/SWHC046-06 Pkg HP AC Com/query_SWHC046_QC.txt
new file mode 100644
index 000000000..fc4fc5b7a
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/query_SWHC046_QC.txt	
@@ -0,0 +1,41 @@
+InputVerificationandResultsSummary/Entire Facility/General/Value/Program Version and Build
+InputVerificationandResultsSummary/Entire Facility/General/Value/Weather File
+InputVerificationandResultsSummary/Entire Facility/Zone Summary/Area/Conditioned Total
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Utility Use Per Conditioned Floor Area/Electricity Intensity/HVAC
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Utility Use Per Conditioned Floor Area/Natural Gas Intensity/HVAC
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Generators
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Total End Uses
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Generators
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Total End Uses
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Heating, Unmet Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Cooling, Unmet Cooling
+ComponentSizingSummary/Entire Facility/Coil:Heating:Electric/Design Size Nominal Capacity/*, MZ-VAV ATU Heating Coil Nominal Capacity[W]
+ComponentSizingSummary/Entire Facility/AirTerminal:SingleDuct:VAV:Reheat/Design Size Maximum Air Flow Rate/*, MZ-VAV ATU Design Size Maximum Air Flow Rate[m3/s]
+ComponentSizingSummary/Entire Facility/Coil:Cooling:DX:SingleSpeed/Design Size Gross Rated Total Cooling Capacity/*, DX Coil Cooling Capacity SingleSpeed Systems [W]
+ComponentSizingSummary/Entire Facility/Coil:Cooling:DX:MultiSpeed/Design Size Speed 1 Gross Rated Total Cooling Capacity/*, DX Coil Cooling Capacity MultiSpeed Systems [W]
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/rakefile.rb b/commercial measures/SWHC046-06 Pkg HP AC Com/rakefile.rb
new file mode 100644
index 000000000..4ed80a718
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/rakefile.rb	
@@ -0,0 +1,1010 @@
+# Copyright (c) 2011-2020 Big Ladder Software LLC. All rights reserved.
+# See the file "license.txt" for additional terms and conditions.
+
+if (not defined?(Modelkit))
+  begin
+    require("modelkit")
+  rescue LoadError => exception
+    args = ARGV.join(" ")
+    puts exception
+    puts "\e[1m\e[31mERROR: This rakefile requires the Modelkit library. Make sure that you have the\nModelkit gem installed in your local Rubygems environment, or try running the\nrakefile using your stand-alone installation of Modelkit by typing:\e[0m\n  \e[1mmodelkit rake #{args}\e[0m"
+    exit
+  end
+end
+
+
+require("pathname")
+require("json")
+
+require("modelkit/config")
+require("modelkit/multitable")
+require("modelkit/parametrics")
+require("modelkit/parametrics/worksheet")
+require("modelkit/energyplus")
+
+
+# Add to modelkit-energyplus:
+# other args:
+# - which design days
+# - water mains temp?
+# - daylight saving time?
+def generate_site_pxt(idd, ddy_path, site_path)
+  site_file = File.open(site_path, "w")
+
+  if (File.exists?(ddy_path))
+    input_file = OpenStudio::InputFile.open(idd, ddy_path)
+  else
+    raise("file not found: #{ddy_path.inspect}")
+  end
+
+  site_locations = input_file.find_objects_by_class_name("Site:Location").to_a
+
+  if (site_locations.empty?)
+    raise("could not find Site:Location object in #{ddy_path.inspect}")
+  else
+    site_file.puts(site_locations.first.to_idf)
+  end
+
+  all_design_days = input_file.find_objects_by_class_name("SizingPeriod:DesignDay").to_a
+  selected_design_days = all_design_days.select { |dd| dd.name[/Ann Htg 99.6% Condns DB|Ann Clg 0?.4% Condns DB/i] }
+
+  if (selected_design_days.length < 2)
+    puts "warning: could not find requested design days; including all design days\n"
+    selected_design_days = all_design_days
+  end
+
+  # Write design days to site file.
+  selected_design_days.each { |dd| site_file.puts(dd.to_idf) }
+
+
+# 'CorrelationFromWeatherFile' is available starting in EP 9.0.
+
+# Does this work for design-day only runs?
+# Seems to work for annual.
+  site_file.puts("\n\nSite:WaterMainsTemperature,\n  CorrelationFromWeatherFile;\n")
+
+  daylight_saving_time = input_file.find_objects_by_class_name("RunPeriodControl:DaylightSavingTime").to_a
+  if (not daylight_saving_time.empty?)
+    site_file.puts
+    site_file.puts(daylight_saving_time.first.to_idf)
+  end
+
+  site_file.close
+end
+
+
+# NOPUB Should move into Modelkit somewhere.
+# Support for running simulations in parallel.
+require("open3")
+require("set")
+
+$child_pids = Set.new  # Global tracking of child PIDs
+
+# Return PID?
+def run_process(command, dir)
+  # NOTE: Separate processes are required to make the EnergyPlus runs thread safe!
+  Open3.popen3(command, :chdir => dir) do |stdin, stdout, stderr, thread|
+    $child_pids.add(thread.pid)
+    # This might work with just an instance variable or similar.
+
+    stdin.close  # All input already sent with command
+
+    file_out = File.open("#{dir}/stdout", "w")
+    file_err = File.open("#{dir}/stderr", "w")
+
+    while (line = stdout.gets)
+      file_out.puts(line)
+      #@proc_out.call(line) if (@proc_out)
+    end
+
+    # This is probably not right.
+    while (line = stderr.gets)
+      file_err.puts(line)
+      #@proc_err.call(line) if (@proc_err)
+    end
+
+    stdout.close
+    stderr.close
+
+    file_out.close
+    file_err.close
+
+    #print "Completed: #{File.basename(dir)}\n"
+    $child_pids.delete(thread.pid)
+  end
+end
+
+# Search up through parent directories for one or more possible file names.
+def search_parent_dirs(start_dir, *file_names)
+  path = nil
+  dir_names = start_dir.to_s.split("/")
+  while (not dir_names.empty?) do
+    file_names.each do |file_name|
+      test_path = "#{dir_names.join("/")}/#{file_name}"
+      if (File.exist?(test_path))
+        path = test_path
+        break
+      end
+    end
+    break if (path)
+    dir_names.pop
+  end
+  return(path)
+end
+
+# Search for a file name or partial path in an array of provided directories.
+# Directories are expected to already be absolute paths.
+def resolve_path(path, dirs)
+  resolved_path = nil
+  dirs.each do |dir|
+    expanded_path = File.expand_path(path, dir)
+    if (File.exist?(expanded_path))
+      resolved_path = expanded_path
+      break
+    end
+  end
+  return(resolved_path)
+end
+
+# Clean up any previous output files left behind if 'compose' or 'run' fails.
+# Leftover files can be processed unintentionally by downstream tasks and
+# ultimately generate false results.
+def clean_energyplus_output_files(dir)
+  # Not all of these files might be present. Others might be present and unhandled.
+  paths = [
+    "#{dir}/instance-out.err",
+    "#{dir}/instance-out.rdd",
+    "#{dir}/instance-out.sql",  # Most important for downstream tasks
+    "#{dir}/instance-tbl.htm",
+    "#{dir}/instance-var.csv",
+    "#{dir}/stderr",
+    "#{dir}/stdout"
+  ]
+  FileUtils.rm_f(paths)
+end
+
+
+# Rake stubbornly sets the working directory to wherever the Rakefile is located.
+# The target directory could optionally be set from a CLI option instead.
+study_dir = Rake.application.original_dir
+
+climates_csv_path = "#{study_dir}/climates.csv"
+cohorts_csv_path = "#{study_dir}/cohorts.csv"
+
+query_path = "#{study_dir}/query.txt"
+results_summary_path = "#{study_dir}/results-summary.csv"
+results_profile_elec_path = "#{study_dir}/results-profile-elec.csv"
+results_profile_gas_path = "#{study_dir}/results-profile-gas.csv"
+results_paths = [results_summary_path, results_profile_elec_path, results_profile_gas_path]
+
+cases_dir = "#{study_dir}/cases"
+runs_dir = "#{study_dir}/runs"
+runs_pathname = Pathname.new(runs_dir)
+
+MUTEX = Mutex.new  # Thread lock for when something needs to run in a single thread
+
+config_path = search_parent_dirs(study_dir, ".modelkit-config")
+if (not config_path)
+  raise("modelkit-config file not found in working directory or any parent directory")
+else
+  CONFIG = Modelkit::Config.new(config_path)
+  puts "Using modelkit-config at #{config_path}\n"
+end
+
+config = Hash.new
+[:prototypes_dir, :templates_dir, :weather_dir, :codes_dir].each do |key|
+  config[key] = []
+  field = key.to_s.gsub(/_/, "-")
+  if (not CONFIG[field])
+    raise("#{field} variable missing in modelkit-config")
+  else
+    config_paths = CONFIG[field].split(/\s*;\s*/)  # Split string with semicolons into array of paths
+    config_paths.each do |path|
+      # Resolve path relative to modelkit-config file and normalize the slashes.
+      config[key] << File.expand_path(path.strip.gsub(/\\/, "/"), File.dirname(config_path))
+    end
+  end
+end
+
+max_workers = CONFIG["max-workers"]
+if (max_workers.nil?)
+  max_workers = 1
+end
+
+global_pxv_path = search_parent_dirs(study_dir, "global.pxv")
+if (global_pxv_path)
+  puts "Using global.pxv at #{global_pxv_path}\n"
+end
+
+rake_tasks = Rake.application.top_level_tasks
+rake_task_name = rake_tasks.first  # Multiple tasks are allowed, but assume one
+
+rake_options = Rake.application.options
+rake_options.always_multitask = true  # --multitask, -m
+#rake_options.job_stats = true  # --job-stats   true | :history
+rake_options.thread_pool_size = max_workers - 1  # --jobs, -j (default 12 on Mac)
+
+if (rake_options.dryrun or rake_options.show_all_tasks or
+  rake_options.show_prereqs or rake_options.show_tasks)
+  # These are information-only requests. Rake nonetheless registers as invoked
+  # with the "default" task name but nothing actually gets run.
+  rake_task_name = "none"
+end
+
+
+# Show threads message and info about how to change
+#   Running with 8 threads (edit .modelkit-config to change).
+#   Type Ctrl+C to cancel all tasks.
+
+require "io/console"  # need this anyway for progress bar
+
+#$stdin.echo = false  # turn off echo; in Mac shows a cursor with a key icon
+# This prevents the user from over-typing the output stream.
+
+# also try switching to raw mode--should also block user input; maybe no key icon?
+
+#print "\e[?25l"  # hide the cursor; MUST remember to show it again on exit or else it's permanent for the session!
+
+
+trap("INT") do  # Ctrl+C (polite kill)
+  puts "Canceling all tasks.\n"
+  if ($child_pids)
+    $child_pids.each { |pid| Process.kill("KILL", pid) }
+  end
+  exit
+end
+
+if (Modelkit::Platform.unix?)
+  trap("TSTP") do  # Ctrl+Z (suspend)
+    puts "Suspending all tasks. Type 'fg' to resume.\n"
+    exit
+  end
+end
+
+if (not rake_task_name =~ /^(prune|clean|none)$/)
+
+# If possible, detect if any tasks will be run before showing this message:
+puts "\e[1mType Ctrl+C to cancel all tasks.\e[0m\n"
+
+end
+
+# modelkit rake -A crashes for some reason
+
+# NOPUB Some of above could be included here too.
+# Don't evaluate worksheets and generate file tasks if not necessary!
+# NOTE: prune does need to evaluate worksheets.
+if (not rake_task_name =~ /^(clean|none)$/)
+
+  pxv_paths = []
+  site_paths = []
+
+  compose_idf_paths = []
+
+
+  #rename size_ to sizerun_  size_run_  sizing_run_
+  size_ref_paths = []
+  size_idf_paths = []
+  size_sql_paths = []
+  size_json_paths = []
+
+  hardsize_idf_paths = []
+
+  run_sql_paths = []
+  run_csv_paths = []
+
+
+
+  old_site_paths = Dir.glob("#{runs_dir}/*/site.pxt")
+  old_pxv_paths = Dir.glob("#{runs_dir}/**/instance.pxv")
+
+  climates = Modelkit::Worksheet.open(climates_csv_path)
+  cohorts = Modelkit::Worksheet.open(cohorts_csv_path)
+
+  climate_pattern = ENV["CLIMATE"] || ""
+
+  new_case_csv = "skip,case_name\n,defaults\n"  # Could be read from config instead
+
+  cohorts_first_pass = true
+
+  puts "Evaluating worksheets...\n"
+
+  csv_table = climates.each_row do |row1, index1, variables1, parameters1|
+    #puts "climate_index = #{index1}"
+
+    if (not variables1.key?(:climate))
+      raise("required column \"climate\" is missing in #{File.basename(climates_csv_path)}")
+    end
+
+    climate_name = variables1[:climate].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+    if (climate_name.empty?)
+      raise("climate field cannot be blank for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    next if (not climate_name =~ Regexp.new(climate_pattern))
+
+    FileUtils.mkdir_p("#{runs_dir}/#{climate_name}")
+
+    site_path = "#{runs_dir}/#{climate_name}/site.pxt"
+    if (site_paths.include?(site_path))
+      puts "warning: duplicate name #{climate_name.inspect} in climate column at row #{index1 + 2} in #{File.basename(climates_csv_path)}; row will be skipped"
+      next
+    end
+
+    site_paths << site_path
+
+    if (not variables1.key?(:weather_file))
+      raise("required column \"weather_file\" is missing in #{File.basename(climates_csv_path)}")
+    end
+
+    weather_name = variables1[:weather_file].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+    if (weather_name.empty?)
+      raise("weather_file field cannot be blank for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    epw_path = resolve_path(weather_name, config[:weather_dir])
+    if (not epw_path)
+      puts "Could not resolve path #{weather_name.inspect} from possible paths:\n"
+      config[:weather_dir].each { |dir| puts "  #{File.expand_path(weather_name, dir).inspect}\n" }
+      puts "Check the weather-dir variable in modelkit-config file.\n"
+      raise("weather file #{weather_name.inspect} not found for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    if (not File.file?(epw_path))
+      raise("weather file #{epw_path.inspect} is not a file for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    ddy_path = "#{File.dirname(epw_path)}/#{File.basename(epw_path, ".*")}.ddy"  # Ensure ddy is from same directory as resolved epw file
+    if (not File.exist?(ddy_path))
+      puts "Weather file path resolved to #{epw_path.inspect}\n"
+      raise("ddy file #{ddy_path.inspect} not found for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    # This file only exists to indicate if the weather file changes for dependency purposes.
+    # The weather file is the one input that is separate from instance parameters.
+    weather_path = "#{runs_dir}/#{climate_name}/weather"
+    pathname = Pathname.new(weather_path).relative_path_from(runs_pathname)
+
+    if (File.exist?(weather_path))
+      old_epw_path = File.read(weather_path)
+      if (epw_path != old_epw_path)
+        puts "Updating: #{pathname}\n"
+        File.write(weather_path, epw_path)
+      end
+    else
+      puts "Writing: #{pathname}\n"
+      File.write(weather_path, epw_path)
+    end
+
+    # generate site.pxt from .ddy file
+    file site_path => [weather_path, ddy_path] do
+      idd = open_data_dictionary
+      pathname = Pathname.new(site_path).relative_path_from(runs_pathname)
+      puts "Generating: #{pathname}\n"
+      generate_site_pxt(idd, ddy_path, site_path)
+    end
+
+    if (variables1.key?(:codes_file))  # NOTE: codes_file is an optional column
+      codes_name = variables1[:codes_file].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+      if (codes_name.empty?)
+        raise("codes_file field cannot be blank for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+      end
+
+      codes_path = resolve_path(codes_name, config[:codes_dir])
+      if (not codes_path)
+        puts "Could not resolve path #{codes_name.inspect} from possible paths:\n"
+        config[:codes_dir].each { |dir| puts "  #{File.expand_path(codes_name, dir).inspect}\n" }
+        puts "Check the codes-dir variable in modelkit-config file.\n"
+        raise("codes file #{codes_name.inspect} not found for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+      end
+
+      if (not File.file?(codes_path))
+        raise("codes file #{codes_path.inspect} is not a file for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+      end
+
+      codes_table = Modelkit::MultiTable.new(codes_path)
+
+    else
+      codes_table = nil  # Must set something to pass to next worksheet
+    end
+
+    variables1[:codes] = codes_table  # For backwards compatibility
+
+  # Make sure objects passed in are not mutated by the Worksheet. Make dupes?
+
+    cohort_names = []  # Accumulate names to check for duplicates
+
+    cohorts.each_row(variables1) do |_, index2, variables2, parameters2|
+      #puts "  cohort_index = #{index2}"
+
+      # NOTE: Variables from outer worksheet (variables1) are copied into this worksheet.
+      # Changes to the variables here (variables2) do not propagate back up.
+
+      if (not variables2.key?(:cohort))
+        raise("required column \"cohort\" is missing in #{File.basename(cohorts_csv_path)}")
+      end
+
+      cohort_name = variables2[:cohort].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+      if (cohort_name.empty?)
+        raise("cohort field cannot be blank for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}")
+      end
+
+      if (cohort_names.include?(cohort_name))
+        if (cohorts_first_pass)  # Only warn about this row once
+          puts "warning: duplicate name #{cohort_name.inspect} in cohort column at row #{index2 + 2} in #{File.basename(cohorts_csv_path)}; row will be skipped"
+        end
+        next
+      end
+
+      cohort_names << cohort_name
+
+      cases_csv_path = "#{cases_dir}/#{cohort_name}.csv"
+      cases_csv_short_path = "#{File.basename(cases_dir)}/#{cohort_name}.csv"
+      if (not File.exist?(cases_csv_path))
+        puts("Cases worksheet #{cases_csv_short_path.inspect} not found for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}\n")
+        puts("Creating: #{cases_csv_short_path}\n")
+        FileUtils.mkdir_p(cases_dir)
+        File.write(cases_csv_path, new_case_csv)
+      end
+
+      if (not variables2.key?(:root))
+        raise("required column \"root\" is missing in #{File.basename(cohorts_csv_path)}")
+      end
+
+      root_name = variables2[:root].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+      if (root_name.empty?)
+        raise("root field cannot be blank for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}")
+      end
+
+      root_path = resolve_path(root_name, config[:prototypes_dir])
+      if (not root_path)
+        puts "Could not resolve path #{root_name.inspect} from possible paths:\n"
+        config[:prototypes_dir].each { |dir| puts "  #{File.expand_path(root_name, dir).inspect}\n" }
+        puts "Check the prototypes-dir variable in modelkit-config file.\n"
+        raise("root template #{root_name.inspect} not found for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}")
+      end
+
+      if (not File.file?(root_path))
+        raise("root template #{root_path.inspect} is not a file for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}")
+      end
+
+      case_names = []  # Accumulate names to check for duplicates
+
+      # Better to pre-read and cache this outside the looping?
+      # There are only N worksheets...1 per building type.
+      cases = Modelkit::Worksheet.open(cases_csv_path)
+
+      cases.each_row(variables2) do |_, index3, variables3, parameters3|
+        #puts "    case_index = #{index3}"
+
+        # NOTE: Variables from outer worksheet (variables2) are copied into this worksheet.
+        # Changes to the variables here (variables3) do not propagate back up.
+
+        if (not variables3.key?(:case_name))
+          raise("required column \"case_name\" is missing in #{File.basename(cases_dir)}/#{File.basename(cases_csv_path)}")
+        end
+
+        case_name = variables3[:case_name].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+        if (case_name.empty?)
+          raise("case_name field cannot be blank for row #{index3 + 2} of #{File.basename(cases_dir)}/#{File.basename(cases_csv_path)}")
+        end
+
+        if (case_names.include?(case_name))
+          if (cohorts_first_pass)  # Only warn about this row once
+            puts "warning: duplicate name #{case_name.inspect} in case_name column at row #{index3 + 2} in #{File.basename(cases_dir)}/#{File.basename(cases_csv_path)}; row will be skipped"
+          end
+          next
+        end
+
+        case_names << case_name
+        run_name = "#{climate_name}/#{cohort_name}/#{case_name}"
+        case_dir = "#{runs_dir}/#{run_name}"
+        FileUtils.mkdir_p(case_dir)
+
+  # better to create this dynamically in cases.csv by combining variables from other layers.
+  # all variables need to be propagated first from layer to layer.
+  # for example:
+  #   :run_name
+  #   %= "My Prefix Something: #{climate}/#{cohort}/#{case_name}"
+        pxv_string = ":run_name => #{run_name.inspect},\n"
+
+        parameters = parameters1 | parameters2 | parameters3
+        parameters.each do |key, value|
+          value_inspect = value.inspect
+          if (value.kind_of?(String))
+            # Using `inspect` on strings is useful because it reveals invisible
+            # characters and invalid byte sequences. The downside is that the
+            # string must be unescaped.
+            value_inspect.gsub!(/\\\\/, "\\")
+          end
+          pxv_string << ":#{key} => #{value_inspect},\n"
+        end
+
+        pxv_path = "#{case_dir}/instance.pxv"
+        pxv_paths << pxv_path
+
+        pathname = Pathname.new(pxv_path).relative_path_from(runs_pathname)
+
+        if (File.exist?(pxv_path))
+          old_pxv_string = File.read(pxv_path)
+          if (pxv_string != old_pxv_string)
+            puts "Updating: #{pathname}\n"
+            File.write(pxv_path, pxv_string)
+          end
+        else
+          puts "Writing: #{pathname}\n"
+          File.write(pxv_path, pxv_string)
+        end
+
+        compose_idf_path = "#{case_dir}/instance.idf"
+        compose_idf_paths << compose_idf_path
+
+        if (variables3[:sizing_case])
+          size_name = "#{climate_name}/#{cohort_name}/#{variables3[:sizing_case]}"
+          size_dir = "#{runs_dir}/#{size_name}"
+          size_ref_path = "#{size_dir}/instance.idf"
+
+          size_idf_path = "#{size_dir}/instance-size.idf"
+          size_sql_path = "#{size_dir}/instance-size-out.sql"
+          size_json_path = "#{size_dir}/instance-size-out.json"
+
+          if (size_ref_paths.include?(size_ref_path))
+            # Avoid creating redundant tasks when multiple cases reference same sizing case.
+            create_sizing_tasks = false
+          else
+            create_sizing_tasks = true
+
+            size_ref_paths << size_ref_path
+            size_idf_paths << size_idf_path
+            size_sql_paths << size_sql_path
+            size_json_paths << size_json_path
+          end
+
+          hardsize_idf_path = "#{case_dir}/instance-hardsize.idf"
+          hardsize_idf_paths << hardsize_idf_path
+
+          run_idf_path = hardsize_idf_path  # Which input file to run
+
+          run_sql_path = "#{case_dir}/instance-hardsize-out.sql"
+          run_sql_paths << run_sql_path
+
+          run_csv_path = "#{case_dir}/instance-hardsize-var.csv"
+          run_csv_paths << run_csv_path
+
+        else
+          # Autosize-only run.
+          size_ref_path = nil
+
+          run_idf_path = compose_idf_path  # Which input file to run
+
+          run_sql_path = "#{case_dir}/instance-out.sql"
+          run_sql_paths << run_sql_path
+
+          run_csv_path = "#{case_dir}/instance-var.csv"
+          run_csv_paths << run_csv_path
+        end
+
+        # Compose input file from parameter file.
+        #   need more dependencies here: template files
+        file compose_idf_path => [site_path, root_path, pxv_path, global_pxv_path].compact do  # If no path for global.pxv, remove nil element
+          pathname = Pathname.new(compose_idf_path).relative_path_from(runs_pathname)
+          puts "Composing: #{pathname}\n"
+
+          clean_energyplus_output_files(File.dirname(compose_idf_path))
+
+          site_dir = File.dirname(site_path)
+
+          begin
+            Modelkit::Parametrics.template_compose(root_path,
+              :annotate => CONFIG["template-compose.annotate"],
+              :indent => CONFIG["template-compose.indent"],
+              :esc_line => CONFIG["template-compose.esc-line"],
+              :dirs => [site_dir, *config[:templates_dir]],
+              :files => [global_pxv_path, pxv_path].compact,  # If no path for global.pxv, remove nil element
+              :output => compose_idf_path)
+          rescue Exception => exception
+            puts "#{exception.class.name}: #{exception.message}\n"
+            puts "#{exception.backtrace.first}\n" if (not SyntaxError === exception)
+            puts "Skipping: #{pathname}\n"
+          end
+        end
+
+        if (create_sizing_tasks)
+          # Generate a modified input file in order to run a design-day-only simulation.
+          # NOTE: This can be eliminated if a design-day option is added to energyplus-run.
+          file size_idf_path => size_ref_path do
+            pathname = Pathname.new(size_idf_path).relative_path_from(runs_pathname)
+            puts "Generating size run: #{pathname}\n"
+
+            FileUtils.cp(size_ref_path, size_idf_path)
+
+            idd = open_data_dictionary
+            input_file = OpenStudio::InputFile.open(idd, size_idf_path)
+
+            sc_objs = input_file.find_objects_by_class_name("SimulationControl")
+            if sc_objs.length != 1
+              raise "More than one SimulationControl object found"
+            end
+            sc = sc_objs[0]
+            sc.fields[1] = "Yes"
+            sc.fields[2] = "Yes"
+            sc.fields[3] = "Yes"
+            sc.fields[4] = "Yes"
+            sc.fields[5] = "No"
+
+            input_file.write(size_idf_path)
+          end
+
+          # Run sizing input files for design days only.
+          file size_sql_path => size_idf_path do
+            pathname = Pathname.new(size_idf_path).relative_path_from(runs_pathname)
+            puts "Running size run: #{pathname}\n"
+
+            command = "modelkit-energyplus energyplus-run --weather=\"#{epw_path}\" \"#{size_idf_path}\""
+            run_process(command, size_dir)
+          end
+
+          # Generate size data file (instance-size-out.json).
+          file size_json_path => size_sql_path do
+            pathname = Pathname.new(size_json_path).relative_path_from(runs_pathname)
+            puts "Extracting size data: #{pathname}\n"
+
+            # Make a copy to work on because the original gets overwritten by EnergyPlus.size.
+            temp_path = "#{File.dirname(size_idf_path)}/instance-temp.idf"
+            FileUtils.cp(size_idf_path, temp_path)
+
+            idd = open_data_dictionary
+            input_file = OpenStudio::InputFile.open(idd, temp_path)
+            sql = Modelkit::EnergyPlus::SQLOutput.new(size_sql_path)
+
+            # This will be fixed to only generate JSON and not modify the input file.
+            _, count, output_file = Modelkit::EnergyPlus.size(
+              sql, input_file, {json: size_json_path, version: "9-2"})
+            #puts("#{count} modifications made")
+
+            FileUtils.rm_f(temp_path)
+          end
+        end
+
+        if (hardsize_idf_path)
+          # This would be a reasonable place to use `multitask` because compose_idf_path and
+          # size_json_path are independent and can be run concurrently. However, it seems
+          # like `multitask` doesn't compare timestamps like `file` does. Instead it
+          # always runs like a regular `task`.
+          file hardsize_idf_path => [compose_idf_path, size_json_path] do
+            pathname = Pathname.new(hardsize_idf_path).relative_path_from(runs_pathname)
+            puts "Applying hard sizes: #{pathname}\n"
+
+            idd = open_data_dictionary
+            input_file = OpenStudio::InputFile.open(idd, compose_idf_path)
+
+            json_string = File.read(size_json_path)
+            value_map = JSON.parse(json_string, {:symbolize_names=>true})
+            output_file, count = Modelkit::EnergyPlus.modify_objects(input_file, value_map)
+            #puts("#{count} modifications made")
+
+            # Set SimulationControl fields 1, 2, and 3 to "No", "No", and "No"
+            sc_objs = output_file.find_objects_by_class_name("SimulationControl")
+            if sc_objs.length != 1
+              raise "More than one SimulationControl object found"
+            end
+            sc = sc_objs[0]
+            sc.fields[1] = "No"
+            sc.fields[2] = "No"
+            sc.fields[3] = "No"
+            # Remove Sizing:Zone and Sizing:System objects
+            sizing_zones = output_file.find_objects_by_class_name("Sizing:Zone")
+            sizing_systems = output_file.find_objects_by_class_name("Sizing:System")
+            sizing_plants = output_file.find_objects_by_class_name("Sizing:Plant")
+            (sizing_zones + sizing_systems + sizing_plants).each {|x| output_file.delete_object(x)}
+
+            output_file.write(hardsize_idf_path)
+          end
+        end
+
+        # Run input file in a separate process.
+        file run_sql_path => [epw_path, run_idf_path] do
+          # Not sure why this check is needed; seems to try to run if even IDF does not exist.
+          # May need in other places, like sizing run.
+          next if (not File.exist?(run_idf_path))
+
+          pathname = Pathname.new(run_idf_path).relative_path_from(runs_pathname)
+          puts "Running: #{pathname}\n"
+
+          # Because this is spawned to the shell, .modelkit-config options will be
+          # automatically applied.
+          # NOTE: If modelkit-energyplus was thread safe, would not have to run this
+          #   as a separate process.
+          command = "modelkit-energyplus energyplus-run --weather=\"#{epw_path}\" \"#{run_idf_path}\""
+          run_process(command, case_dir)
+          #$bar.inc
+        end
+
+
+  # see discussion with Michael
+        file run_csv_path => run_sql_path
+
+  # deleting instance-out.csv breaks it; doesn't know how to recover
+
+      end
+    end
+
+    cohorts_first_pass = false
+  end
+
+
+  prune_paths = (old_site_paths - site_paths) + (old_pxv_paths - pxv_paths)
+
+  if (not prune_paths.empty? and not rake_task_name =~ /^(prune|clean|none)$/)
+    puts "\e[1m\e[33mNote: There are cases in the runs directory that are not referenced by any\n" \
+      "worksheet. You may want to delete them by typing:\e[0m\n  \e[1mmodelkit rake prune\e[0m\n"
+  end
+
+end
+
+
+desc "Generate case files"
+task :cases do
+  # No operation; cases are generated when worksheets are evaluated.
+end
+
+
+desc "Delete unreferenced files"
+task :prune do
+  if (prune_paths.empty?)
+    puts "Prune has nothing to delete."
+  else
+    prune_dirs = []
+    puts "\e[1m\e[31mPrune will delete the following files:\e[0m"
+
+# show each as:  dirname/* (106 files)
+
+    prune_paths.each do |path|
+      dir = File.dirname(path)
+      prune_dirs << dir
+      pathname = Pathname.new(dir).relative_path_from(runs_pathname)
+      puts "  \e[31m#{pathname}\e[0m"
+    end
+    print "\e[1m\e[31mConfirm (y/n)?\e[0m "
+
+    input = ENV["CONFIRM"] || $stdin.gets || ""
+    if (ENV["CONFIRM"] or not $stdin.tty?)
+      puts input  # Echo when not already written to STDOUT
+    end
+
+    $start_time = Time.now  # Reset to cut out wait time on the user prompt
+    if (input.strip =~ /^y/i)
+      puts "Pruning files..."
+
+      # maybe don't have to repeat this--already said what was to be deleted
+      prune_dirs.each do |dir|
+        pathname = Pathname.new(dir).relative_path_from(runs_pathname)
+        puts "Deleting: #{pathname}"
+        FileUtils.rm_rf(dir)
+      end
+    else
+      puts "Task canceled."
+    end
+  end
+end
+
+
+desc "Delete all files and results"
+task :clean do
+  paths = []; names = []
+  [runs_dir, *results_paths].each do |path|
+    if (File.directory?(path))
+      count = Dir.glob("#{path}/**/*").count { |f| File.file?(f) }
+      if (count.nonzero?)
+        paths << Dir.glob("#{path}/*")
+        names << "#{File.basename(path)}/* (#{count} files)"
+      end
+    elsif (File.file?(path))
+      paths << path
+      names << File.basename(path)
+    end
+  end
+
+  if (paths.empty?)
+    puts "Clean has nothing to delete."
+  else
+    puts "\e[1m\e[31mClean will delete the following files:\e[0m"
+    names.each { |name| puts "  \e[31m#{name}\e[0m"}
+    print "\e[1m\e[31mConfirm (y/n)?\e[0m "
+
+    input = ENV["CONFIRM"] || $stdin.gets || ""
+    if (ENV["CONFIRM"] or not $stdin.tty?)
+      puts input  # Echo when not already written to STDOUT
+    end
+
+    $start_time = Time.now  # Reset to cut out wait time on the user prompt
+    if (input.strip =~ /^y/i)
+      puts "Cleaning files..."
+      FileUtils.rm_rf(paths)
+    else
+      puts "Task canceled."
+    end
+  end
+end
+
+
+desc "Generate site files (site.pxt)"
+multitask :sites => site_paths
+
+
+desc "Compose input files"
+multitask :compose => compose_idf_paths
+
+
+# Generate size input files
+multitask :"size-idf" => size_idf_paths
+
+
+# Run size input files
+multitask :"size-sql" => size_sql_paths
+
+
+# Extract size data
+multitask :"size-json" => size_json_paths
+
+
+desc "Apply hard sizes to input files"
+multitask :hardsize => hardsize_idf_paths
+
+
+desc "Run input files"
+multitask :run => run_sql_paths
+
+
+file query_path do
+  puts "Query file not found.\n"
+  query =
+"AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Site Energy, Net Site EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Site Energy, Net Site Energy
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Total End Uses, Electricity
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Total End Uses, Natural Gas\n"
+  File.write(query_path, query)
+  puts "Writing default query file: #{query_path}\n"
+end
+
+
+file results_summary_path => [*run_sql_paths, query_path] do
+  pathname = Pathname.new(results_summary_path).relative_path_from(Pathname.new(study_dir))
+  puts "Processing: #{pathname}\n"
+
+  short_paths = run_sql_paths.map { |path| Pathname.new(path).relative_path_from(runs_pathname) }
+  Modelkit::EnergyPlus.sql(short_paths, query_path, :dir => runs_dir, :output => results_summary_path)
+end
+
+
+file results_profile_elec_path => run_csv_paths do
+  aggregate_profiles("Electricity:Facility", results_profile_elec_path, run_csv_paths, runs_pathname, study_dir)
+end
+
+
+file results_profile_gas_path => run_csv_paths do
+  aggregate_profiles("Gas:Facility", results_profile_gas_path, run_csv_paths, runs_pathname, study_dir)
+end
+
+
+desc "Aggregate the simulation results"
+task :results => results_paths
+
+
+task :default => :results
+
+
+def aggregate_profiles(column_name, output_path, run_csv_paths, runs_pathname, study_dir)
+  pathname = Pathname.new(output_path).relative_path_from(Pathname.new(study_dir))
+  puts "Processing: #{pathname}\n"
+
+  short_paths = run_csv_paths.map { |path| Pathname.new(path).relative_path_from(runs_pathname) }
+
+  columns = []
+  column_header = nil
+  date_time = true
+  short_paths.each do |short_path|
+    csv_path = "#{runs_pathname}/#{short_path}"
+    if (File.exist?(csv_path))
+      csv = CSV.read(csv_path, :headers=>true)
+      if (date_time)
+        column = csv["Date/Time"]
+        column.unshift("Date/Time")  # Add header
+        columns << column
+        date_time = false
+      end
+      if (not column_header)
+        # Match column name to the header while ignoring units/interval, i.e., [J](Hourly).
+        column_header = csv.headers.find { |header| header.match(column_name) }
+      end
+      column = csv[column_header]
+      column.unshift(short_path)  # Add header
+      columns << column
+    else
+      puts "warning: file not found: #{csv_path}\n"
+    end
+  end
+
+  File.open(output_path, "w") do |file|
+    columns.transpose.each { |row| file.puts(row.join(",")) }
+  end
+end
+
+
+# NOPUB consider building this into modelkit-energyplus.
+#   basically caches IDD path and avoids concurrent openings.
+
+# Open the EnergyPlus IDD if needed, but only do it once.
+def open_data_dictionary
+  MUTEX.synchronize do  # Lock to prevent opening multiple times concurrently
+    if (@idd.nil?)
+      puts "Opening Energy+.idd...\n"
+
+      if (path = CONFIG["energyplus-run.engine"])
+        path = File.expand_path(path.gsub(/\\/, "/"))  # Resolve path and normalize
+        if (File.exist?(path))
+          idd_path = "#{path}/Energy+.idd"
+          if (not File.exist?(idd_path))
+            raise("Energy+.idd not found in specified EnergyPlus directory: #{path}")
+          end
+        else
+          raise("EnergyPlus directory not found: #{path}")
+        end
+      else
+        raise("energyplus-run.engine field missing in .modelkit-config")
+      end
+
+      @idd = OpenStudio::DataDictionary.open(idd_path)
+    end
+  end
+  return(@idd)
+end
+
+
+# NICE, works
+#require "rake/cpu_counter"
+#puts "cpu=#{Rake::CpuCounter.count}"
+
+# Almost works but not quite:
+
+# shows what command was invoked from CLI
+# if blank (even with -T), it's "default".
+#puts "top level:"
+# cli_tasks = Rake.application.top_level_tasks
+# cli_task_name = cli_tasks.first  # could be more than one; just grab first for now
+# puts "cli_task_name=#{cli_task_name}"  # returns String
+
+# cli_task = Rake.application.tasks.find { |t| t.name == cli_task_name }  # returns Rake::Task
+# puts "cli_task=#{cli_task}"
+#
+
+#
+## Rake has this builtin:
+#  Rake.application.lookup(task_name) => task
+
+# work_to_do = false
+# if (cli_task.needed?)
+#   # Just because needed doesn't mean there is any work to do--check prereqs!
+#   cli_task.prerequisite_tasks.each do |prereq|
+#     if (prereq.needed?)
+#       work_to_do = true
+#       break
+#     end
+#   end
+# end
+#
+# if (work_to_do)
+#   puts "Work to do!"
+# else
+#   puts "Up to date; nothing to do."
+# end
+
+
+$start_time = Time.now
+#$bar = RakeProgressbar.new(run_sql_paths.length)
+
+at_exit do
+  #$bar.finished
+  if (not rake_task_name =~ /^none$/)
+    puts "Elapsed task duration: #{Time.now - $start_time} sec"
+  end
+end
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/result2.py b/commercial measures/SWHC046-06 Pkg HP AC Com/result2.py
new file mode 100644
index 000000000..80562acf7
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/result2.py	
@@ -0,0 +1,672 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""EnergyPlus batch results data scraping tool, including DEER peak period.
+
+Features:
+* Read from instance-out.sql files using result spec format like modelkit
+* Apply DEER peak period calculation to hourly results and include those.
+* Requires python >= 3.7.1 and additional package "tqdm"
+
+Usage:
+    Prerequisite: running models, select a query file, path to DEER peak period definitions
+    $terminal1> cd C:/DEER-Prototypes-EnergyPlus/
+    $terminal1> python "scripts/result2.py" "commercial measures/SWXX000-00 Measure Name" --queryfile "querylibrary/query_default.txt"
+
+Changelog
+    * 2024-05-01 Adapted result.py for DEER Peak period calculation
+    * 2024-05-15 Filename patterns updated to match folders like runs1, runs-Asm, etc.
+
+@Author: Nicholas Fette <nfette@solaris-technical.com>
+@Date: 2024-05-01
+
+"""
+
+# Select columns from hourly files to apply DEER peak calculation
+DEERPEAK_COLUMNS = ["Electricity:Facility [J](Hourly)"]
+# Do you want to append "(units)"" in the column name, if available?
+APPEND_UNITS = False
+
+##STEP 0: Setup (import all necessary libraries)
+import re
+from dataclasses import dataclass, asdict
+from sqlite3 import connect, Connection
+from pathlib import Path
+from functools import cache
+import argparse
+import concurrent.futures
+try:
+    # itertools.batched available only after python 3.12
+    from itertools import batched
+except:
+    from itertools import islice
+    def batched(iterable, n):
+        # batched('ABCDEFG', 3) → ABC DEF G
+        if n < 1:
+            raise ValueError('n must be at least one')
+        it = iter(iterable)
+        while batch := tuple(islice(it, n)):
+            yield batch
+
+# Third-party packages
+import numpy as np
+import pandas as pd
+import tqdm
+
+def get_deer_peak_day(bldgloc: str):
+    """Return a for DEER peak period start day lookups.
+
+    Input:
+        BldgLoc: str
+            CEC climate zone, e.g. CZ01 through CZ16.
+
+    Returns:
+        PkDay: int
+            1-based day number index for first day of the 3-day DEER peak period.
+    """
+    peakperspec = dict([
+        ("CZ01",238),
+        ("CZ02",238),
+        ("CZ03",238),
+        ("CZ04",238),
+        ("CZ05",259),
+        ("CZ06",245),
+        ("CZ07",245),
+        ("CZ08",245),
+        ("CZ09",244),
+        ("CZ10",180),
+        ("CZ11",180),
+        ("CZ12",180),
+        ("CZ13",180),
+        ("CZ14",180),
+        ("CZ15",180),
+        ("CZ16",224),
+    ])
+    return peakperspec[bldgloc]
+
+@cache
+def get_deer_peak_multipliers(BldgLoc: str,
+                          days=3, start_hr=16, end_hr=21, dst=True):
+    """Return a masking array useful to calculate an average over DEER Peak Period.
+
+    Note that for compatibility, simulation data must be an 8760-length array
+    that represents one annual period (no gaps or duplicates due to dst).
+
+    Inputs:
+        BldgLoc: str
+            CEC climate zone, e.g. CZ01 through CZ16.
+        days: int
+            The number of days in the DEER Peak Period (default 3)
+        start_hr: int
+            The time of day (hour) at which DEER Peak starts, in prevailing time.
+            For example, start_hr=16 means the DEER Peak starts at 4 PM.
+        end_hr: int
+            The time of day (hour) at which DEER Peak ends, in prevailing time.
+            For example, start_hr=21 means the DEER Peak ends at 9 PM.
+        dst: bool
+            Clarifies the interpretation of start_hr.
+            If dst = False, then no adjustment is made for start_hr.
+            If dst = True, then assume Daylight Saving Time is active
+            during the DEER Peak, and make the appropriate offset.
+
+    Usage:
+        load_data = get_load_8760('CZ11', ...) # replace with your load data as a np.ndarray
+        dpm = deer_peak_multipliers('CZ11')
+        dpload = sum(load_data * dpm)
+    """
+    peak_day = get_deer_peak_day(BldgLoc)
+    # In case start_hr and end_hr are given in daylight saving time (DST), shift back to standard time.
+    # time_dst = time_standard + 1
+    start_hr -= 1 * dst
+    end_hr -= 1 * dst
+    # Fill an array with 0-based hour of year.
+    hour_of_year = np.arange(0,8760)
+    # Calculate 0-based hour and day (standard time; this is never DST).
+    hour_of_day_0 = np.mod(hour_of_year, 24)
+    day_of_year_0 = np.mod(hour_of_year//24, 365)
+    # Calculate 1-based hour and day (matches conventions of DEER post-process script).
+    hour_of_day_1 = hour_of_day_0 + 1
+    day_of_year_1 = day_of_year_0 + 1
+    # Is the hour in the DEER Peak period?
+    is_deer_peak_day = (day_of_year_1 >= peak_day) * (day_of_year_1 <= peak_day + days)
+    is_deer_peak_hour = (hour_of_day_0 >= start_hr) * (hour_of_day_0 < end_hr)
+    is_deer_peak = is_deer_peak_day * is_deer_peak_hour
+    # Normalize
+    multipliers8760 = is_deer_peak / sum(is_deer_peak)
+    return multipliers8760
+
+@dataclass
+class ResultSpec(object):
+    ReportName: str
+    ReportForString: str
+    TableName: str
+    ColumnName: str
+    RowName: str
+
+    def to_string(self):
+        return "{ReportName}/{ReportForString}/{TableName}/{ColumnName}/{RowName}".format(**asdict(self))
+
+def makeResultSpec(specstr: str) -> ResultSpec:
+    fields = specstr.split('/')
+    return ResultSpec(*fields)
+
+@cache
+def parse_query_file(queryfile: Path):
+    """Reads the query.txt file and returns a list of tuples (resultspec, name)
+    where
+        resultspec is a ResultSpec object
+        name is the name to assign to output.
+
+    If name is ommitted in the query.txt, name will be like "ColumnName/RowName".
+    """
+    if not isinstance(queryfile, Path):
+        queryfile = Path(queryfile)
+
+    listlist_query_path_and_name = []
+    list_query_path_and_name = []
+    lines = queryfile.read_text().split('\n')
+    for query_line in lines:
+        # Blank line indicates a new group
+        if len(query_line.strip()) == 0:
+            if list_query_path_and_name != []:
+                listlist_query_path_and_name.append(list_query_path_and_name)
+                list_query_path_and_name = []
+            continue
+        if query_line.startswith("#"):
+            continue
+        m = re.match(r'\s*(.+)\s*,\s*(.+)\s*',query_line)
+        if m:
+            query_path, user_column_name = m.groups()
+            resultspec = makeResultSpec(query_path)
+        else:
+            query_path = query_line.strip()
+            resultspec = makeResultSpec(query_path)
+            user_column_name = "{ColumnName}/{RowName}".format(**asdict(resultspec))
+        list_query_path_and_name.append((resultspec, user_column_name))
+    if list_query_path_and_name != []:
+        listlist_query_path_and_name.append(list_query_path_and_name)
+    return listlist_query_path_and_name
+
+def build_query_with_special_cases(resultspec: ResultSpec, finalize = True) -> str:
+    """Returns SQLite query that can be executed to extract results from EnergyPlus tabular reports.
+
+    Special cases:
+        For compatibility with modelkit queries, "Total Energy" is emulated as follows.
+            AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/X
+        translates to
+            AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/*/X where ColumnName <> Water.
+
+    Inputs:
+        resultspec: ResultSpec
+            A ResultSpec object or modelkit-style query path to transform into an SQLite query.
+        finalize: bool, default True
+            Whether to terminate the query with a semicolon (;)
+
+    Returns:
+        query:
+            SQLite query string (e.g. SELECT * from TabularDataWithStrings WHERE ...).
+        agg_columns: list[str]
+            List of columns in which the query includes a wildcard (*), useful to aggregate the results.
+    """
+    TOKEN_ANY = '*'
+    #TABULAR_DATA_HEADERS = ['ReportName', 'ReportForString',
+    #    'TableName', 'ColumnName', 'RowName']
+
+    if not isinstance(resultspec, ResultSpec):
+        resultspec = makeResultSpec(resultspec)
+
+    if resultspec.to_string().startswith("AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/"):
+        # Special case. 'Total Energy' is a synthetic result not defined by EnergyPlus.
+        # It is not a good idea to use this because it is adding quantities with different meanings (kWh electric + kWh gas, etc).
+        if resultspec.RowName == TOKEN_ANY:
+            query,agg_columns = build_query_with_special_cases(
+                "AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/*/*",
+                False)
+            query += """ AND ColumnName <> 'Water';"""
+            return query,agg_columns
+        else:
+            query,agg_columns = build_query_with_special_cases(
+                f"AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/*/{resultspec.RowName}",
+                False)
+            query += """ AND ColumnName <> 'Water';"""
+            return query,agg_columns
+
+    agg_columns = ['ReportName']
+    query = """SELECT * from TabularDataWithStrings
+                WHERE ReportName = :ReportName"""
+
+    if (resultspec.ReportForString and resultspec.ReportForString != TOKEN_ANY):
+        query += " AND ReportForString = :ReportForString"
+        agg_columns.append('ReportForString')
+
+    if (resultspec.TableName and resultspec.TableName != TOKEN_ANY):
+        query += " AND TableName = :TableName"
+        agg_columns.append('TableName')
+
+    if (resultspec.ColumnName and resultspec.ColumnName != TOKEN_ANY):
+        query += " AND ColumnName = :ColumnName"
+        agg_columns.append('ColumnName')
+
+    if (resultspec.RowName and resultspec.RowName != TOKEN_ANY):
+        query += " AND RowName = :RowName"
+        agg_columns.append('ReportForString')
+
+    if finalize:
+        query += ";"
+    agg_columns.append('Units')
+    return query, agg_columns
+
+
+def get_sim_hourly(conn: Connection):
+    """Get simulation hourly results from one EnergyPlus SQLite output file.
+
+    Returns:
+        ReportDataWide: pandas.DataFrame
+            Table with shape (N,8760) where each of N rows represent an hourly variable
+            and each of 8760 columns represents one hour of an annual simulation period.
+            Names of hourly variables in the index column follow the EnergyPlus CSV output convention.
+
+    Example
+
+        >>> with connect('instance-out.sql') as conn:
+                ReportDataWide = get_hourly_results_deer(conn, 'CZ11')
+        >>> ReportDataWide
+            TimeIndex                                                      1            2                8760
+            LookupKey
+            Electricity:Facility [J](Hourly)                               5.222829e+07 4.893178e+07 ... 5.366953e+07
+            Environment:Site Outdoor Air Drybulb Temperature [C](Hourly)   5.358333e+00 5.841667e+00 ... 5.575000e+00
+
+    Technical details:
+        Implementation joins the ReportDataDictionary and ReportData tables.
+        LookupKey returned
+        Requires that the EnergyPlus model contains an OutputControl:Files object with SQLite = Yes.
+    """
+
+    ReportDataDictionary = pd.read_sql_query('select * from ReportDataDictionary', conn, index_col='ReportDataDictionaryIndex')
+    #n_rows, = conn.execute('select count(*) from ReportData').fetchone()
+    chunks = []
+    for chunk in pd.read_sql_query('select * from ReportData', conn, chunksize=10000):
+        chunks.append(chunk)
+    ReportData = pd.concat(chunks, axis=0)
+
+    # Transform ReportDataDictionary so we have a single column lookup string.
+    # LookupKey looks like:
+    #   If 'EL7 NORTH PERIM ZN (G.N2):Zone Total Internal Total Heating Energy [J](Hourly)'
+    # LookupKey looks like 'EL7 NORTH PERIM ZN (G.N2):Zone Total Internal Total Heating Energy [J](Hourly)'
+    ReportDataDictionary['LookupKey']=ReportDataDictionary.apply(
+        lambda x: f'{x.KeyValue}:{x.Name} [{x.Units}]({x.ReportingFrequency})' if bool(x.KeyValue)
+        else f'{x.Name} [{x.Units}]({x.ReportingFrequency})'
+        , axis=1)
+    ReportData2 = ReportData.join(ReportDataDictionary, on='ReportDataDictionaryIndex')
+
+    # Transform ReportData from long to wide so we can make a condensed table
+    ReportDataWide = ReportData2.pivot(index='LookupKey',columns='TimeIndex',values='Value')
+    # Prepare the table for saving in a database
+    #ReportDataWide['sim_id'] = sim_run.sim_id
+    #ReportDataWide2=ReportDataWide.reset_index().set_index(['TimeIndex'],drop=True)
+
+    return ReportDataWide
+
+def get_sim_deer_peak(conn: Connection, bldgloc: str):
+    """Get simulation DEER Peak results from one EnergyPlus SQLite output file.
+
+    Inputs:
+        conn: sqlite3.Connection
+            An open connection to the SQLite output file from an EnergyPlus simulation.
+        bldgloc: str
+            The CEC climate zone used to lookup up DEER peak period dates.
+    Returns:
+        deer_peak_values: dict
+            Lookup where each item `(k, v)` represents the average value `v`
+            of the hourly variable named `k` over the DEER Peak Period.
+    """
+    # Get all available hourly results with shape (N, 8760)
+    ReportDataWide = get_sim_hourly(conn)
+    ReportDataWide = ReportDataWide.loc[DEERPEAK_COLUMNS]
+    if ReportDataWide.shape[1] != 8760:
+        # No hourly data. This can happen if simulation created the output file but failed to complete.
+        # Or if the file represents a sizing run.
+        return None
+    # Get 8760-length mask for DEER Peak Period (normalized)
+    dpm = get_deer_peak_multipliers(bldgloc)
+    # Compute the average value over the DEER Peak Period
+    # In testing, pandas.DataFrame.mul() takes about 1 ms
+    #deer_peak_values = ReportDataWide.mul(dpm,axis=1).sum(axis=1).to_dict()
+    # In testing, pandas.DataFrame.to_numpy().dot() takes about 7 µs
+    deer_peak_values = dict(zip(ReportDataWide.index, ReportDataWide.to_numpy().dot(dpm)))
+    return deer_peak_values
+
+def get_sim_tabular(
+        conn: Connection,
+        resultspec: ResultSpec,
+        aggtype = 'sum'
+        ) -> tuple:
+    """Returns result information based on a single query from tabular reports.
+
+    Inputs:
+        conn: sqlite3.Connection
+            Open connection to the model instance results database (e.g. instance-out.sql)
+
+        aggtype: str
+            Aggregation type, e.g. sum. Explains how to combine multiple values where
+            the query includes a wildcard (*).
+
+    Returns (sim_data_detail, sim_data_agg) where:
+        sim_data_detail: pandas.DataFrame or None
+            DataFrame of raw results from the model, possibly including multiple rows in case of a wildcard.
+        sim_data_agg: float or None
+            Single value. In case of wildcard in query, this is calculated according to aggtype.
+    """
+    if not isinstance(resultspec, ResultSpec):
+        resultspec = makeResultSpec(resultspec)
+    query, agg_columns = build_query_with_special_cases(resultspec)
+
+    try:
+        sim_data_detail = pd.read_sql_query(query, conn,  params=asdict(resultspec), dtype={'Value':float})
+    except ValueError:
+        # If user requested a query that returns a string value
+        # To do: aggregation doesn't work with string type results.
+        sim_data_detail = pd.read_sql_query(query, conn,  params=asdict(resultspec))
+
+    if sim_data_detail.empty:
+        # No data found matching result spec
+        return None, None
+    elif len(sim_data_detail) == 1:
+        # Only one value, no aggregation required
+        return sim_data_detail, sim_data_detail.loc[0,'Value']
+    else:
+        # Aggregation requested. Calculate a single float value.
+        sim_data_agg = (
+            sim_data_detail
+            .groupby(agg_columns)
+            ['Value'].agg(aggtype).iloc[0]
+        )
+        return sim_data_detail, sim_data_agg
+
+def get_sim_peak_and_tabular(queryfile: Path,
+                             sqlfile: Path,
+                             bldgloc: str,
+                             metadata: dict):
+    r"""
+    Read selected data entries from SQL outputs.
+    Result set specifications are parsed from query.txt, e.g. (resultspec, name).
+    Output columns will have units appended to name, like "name (Units)".
+
+    Inputs:
+        queryfile: Path
+            The filename of a modelkit-style query.txt file.
+        sqlfile: Path
+            The filename of an EnergyPlus output file (SQLite format).
+        bldgloc: str
+            The CEC climate zone, e.g. CZ01 through CZ16.
+        metadata: dict
+            An dictionary of identifier information prepended to the results.
+            For compatibility use metadata = {'File Name': 'path/to/model/instance-out.sql'}
+
+    Returns:
+        sim_data: dict(str: float | None).
+            Mapping of (name, value) from both query results
+            and hourly averages over the DEER peak period.
+    """
+    sim_data = metadata.copy() # To store results
+    with connect(sqlfile) as conn:
+        # Start with the query data results
+        listlist_query_path_and_name = parse_query_file(queryfile)
+        # Don't separate "groups" of queries but group them all together.
+        # result_sets = []
+        for list_query_path_and_name in listlist_query_path_and_name:
+            # Don't separate "groups" of queries but group them all together.
+            # sim_data_detail, sim_data_agg = [], []
+            for resultspec, user_column_name in list_query_path_and_name:
+                # 2025-01-22 Updated Nicholas Fette
+                # Default to the column name from the result query without attempting to append unit symbol from results.
+                # This avoids errors due to mismatched column names when a file is missing one or more results.
+                # Useful for concatenating results in a wide-format table.
+                output_column_name = user_column_name
+                
+                if APPEND_UNITS:
+                    # For consistency between files, do not append "(units)" in the column name for wildcard queries.
+                    if "*" not in resultspec.to_string() and sim_data_detail1 is not None:
+                        units = sim_data_detail1['Units'].iloc[0]
+                        output_column_name = f"{user_column_name} ({units})"
+
+                sim_data_detail1, sim_data_agg1 = get_sim_tabular(conn, resultspec)
+                if sim_data_detail1 is None:
+                    # No data found matching the result spec.
+                    # 2025-01-22 Updated Nicholas Fette
+                    # For consistency between files, store a None/NULL result for this column.
+                    # To-do: In sqlite output mode, pandas may not be able to guess the dtype.
+                    # As a workaround, user may manually alter the sim_data table column types, then run the script.
+                    sim_data.update({output_column_name: None})
+                    continue
+                # This script does not compile detail of all rows included in wildcard queries:
+                #sim_data_detail.append(sim_data_detail1)
+                if sim_data_agg1 is not None:
+                    sim_data.update({output_column_name: sim_data_agg1})
+            #sim_data_agg.append(sizing_agg_row)
+
+        # Now get the DEER Peak values from hourly data
+        # Column name(s) for DEER Peak average values are taken directly from hourly output column name.
+        deer_peak_values = get_sim_deer_peak(conn, bldgloc)
+        if deer_peak_values is not None:
+            sim_data.update(deer_peak_values)
+
+    return sim_data
+
+def get_runs_instances(study: Path, search_pattern = '**/instance*-out.sql', exclude = 'instance-size-out.sql'):
+    r"""Returns a list of all of SQLite output files in a modelkit study folder.
+
+    Assumes that files are placed within a "runs" subfolder under the given study.
+
+    Inputs:
+        study: pathlib.Path
+            The folder in which to search for simulation outputs.
+            E.g. old style: "C:\Users\User1\DEER-Prototypes-EnergyPlus\Analysis\SFm_Furnace_1975"
+            E.g. new style: "C:\Users\User1\DEER-Prototypes-EnergyPlus\commercial measures\SWHC012-04 Occupancy Sensor"
+        search_pattern: str, default = 'instance*-out.sql'
+            The filename pattern used to search for output files, using glob syntax.
+        exclude_pattern: str, default = 'instance-size-out.sql'
+            A filename pattern to exclude.
+
+    Returns: list of tuples (sqlfile, bldgloc, metadata) where
+        sqlfile: pathlib.Path
+            An EnergyPlus SQLite output file found in the study folder.
+        bldgloc: str
+            CEC Climate zone found in file name.
+        metadata: dict
+
+        Default metadata fields:
+            'File Name'
+                File path relative to study folder, with forward slashes.
+    """
+    if not isinstance(study, Path):
+        study = Path(study)
+    # Note that autosized runs are named instance-out.sql.
+    # Linked-sizing runs are named instance-hardsize-out.sql.
+    # Sizing-only runs are named instance-size-out.sql.
+    for sqlfile in study.glob(search_pattern):
+        if sqlfile.match(exclude):
+            continue
+        relpath = sqlfile.relative_to(study)
+        # E.g. relpath = Path(r"runs\CZ01\SFm&1&rDXGF&Ex&SpaceHtg_eq__GasFurnace\Msr-Res-GasFurnace-AFUE95-ECM\instance-out.sql")
+        relstr = relpath.as_posix() # with forward slashes
+        # E.g. relstr = "runs/CZ01/SFm&1&rDXGF&Ex&SpaceHtg_eq__GasFurnace/Msr-Res-GasFurnace-AFUE95-ECM/instance-out.sql"
+        # Search string for climate zone like 'CZ11/'.
+        m = re.search(r"CZ\d\d(?=/)", relstr)
+        if not m:
+            raise ValueError(f'Could not match climate zone in filename: "{relstr}"')
+        bldgloc = m[0]
+
+        metadata = {}
+        # For compatibility with modelkit, may want to remove 'runs/' prefix.
+        # E.g. filename = "CZ01/SFm&1&rDXGF&Ex&SpaceHtg_eq__GasFurnace/Msr-Res-GasFurnace-AFUE95-ECM/instance-out.sql"
+        # pathsub = (r'runs/','')
+        #metadata['File Name'] = re.sub(*pathsub, relstr, 1)
+        metadata['File Name'] = relstr
+        metadata['BldgLoc'] = bldgloc
+
+        # Try to get additional metadata, but don't fail if it doesn't match.
+        patterns = [
+            r'.*/runs[^/]*/(?P<BldgLoc>CZ\d\d)/(?P<BldgType>\w+)&(?P<Story>\w+)&(?P<BldgHVAC>\w+)&(?P<BldgVint>\w+)&(?P<TechGroup>\w+)__(?P<TechType>\w+)/(?P<TechID>[^/]+)/instance.*',
+            r'.*/runs[^/]*/(?P<BldgLoc>CZ\d\d)/(?P<Cohort>[^/]+)/(?P<Case>[^/]+)/instance.*'
+        ]
+        for pattern in patterns:
+            m2 = re.match(pattern, relstr)
+            if m2:
+                metadata.update(m2.groupdict())
+                break
+
+        yield (sqlfile, bldgloc, metadata)
+
+def gather_sim_data(study: Path, queryfile: Path, parallel=False):
+    r"""Returns a generator yielding simulation data from each simulation.
+
+    Read selected data entries from SQL outputs as well as DEER Peak period averages of hourly variables.
+    Result set specifications are parsed from query.txt, e.g. (resultspec, name).
+    Output columns will have units appended to name, like "name (Units)".
+
+    Assumes that files are placed within a "runs" subfolder under the given study.
+
+    study: e.g., "C:\Users\User1\DEER-Prototypes-EnergyPlus\Analysis\SFm_Furnace_1975"
+
+    Returns:
+        Generator yielding dictionary objects.
+
+    Example:
+        >>> for sim_data in gather_sim_data(sqlfile, queryfile):
+        >>>    pass
+        >>> sim_data
+        {
+            "File Name": "mymeasure_vintage/CZ01/cohort/case/instance-out.sql",
+            "Net Site EUI (kWh/m2)": 90.97,
+            "Electricity:Facility [J](Hourly)": 3738615573
+        }
+    """
+    print(f"Reading from {study}")
+    # Make sure queryfile does not give an error before starting main loop.
+    _ = parse_query_file(queryfile)
+
+    if not parallel:
+        for sqlfile, bldgloc, metadata in tqdm.tqdm(list(get_runs_instances(study))):
+            # Start the load operations and mark each future with its input arguments.
+            yield get_sim_peak_and_tabular(queryfile, sqlfile, bldgloc, metadata)
+    else:
+        list_sqlfile = list(get_runs_instances(study))
+        # Use a concurrent.futures.Executor to achieve some parallelism.
+        # This should speed up the process if there are a large number of files.
+        # In initial testing, ThreadPoolExecutor was 0.5x the speed of a single-threaded loop.
+        # However, ProcessPoolExecutor was 3-4x the speed of a single-threaded loop.
+        #with concurrent.futures.ThreadPoolExecutor() as executor:
+        with concurrent.futures.ProcessPoolExecutor() as executor:
+            #print("Created a thread pool with ",executor._max_workers)
+            future_lookup = dict() # Remember each file when requested.
+            # Queue each operation to read simulation data, returning a future.
+            for (sqlfile, bldgloc, metadata) in list_sqlfile:
+                # Start the load operations and mark each future with its input arguments.
+                future = executor.submit(get_sim_peak_and_tabular, queryfile, sqlfile, bldgloc, metadata)
+                future_lookup[future] = (sqlfile, bldgloc, metadata)
+
+            # Wait for futures to complete and show a progress bar.
+            import time
+            for i,future in zip(
+                tqdm.trange(len(list_sqlfile), desc=study.name), # progress bar
+                concurrent.futures.as_completed(future_lookup)  # waiting for results from parallel threads
+            ):
+                (sqlfile, bldgloc, metadata) = future_lookup[future]
+                try:
+                    sim_data = future.result()
+                except Exception as exc:
+                    print(f'Reading {sqlfile} generated an exception: {exc}')
+                else:
+                    yield sim_data
+                    time.sleep(0.001)
+
+def gather_sim_data_to_csv(study: Path, queryfile: Path, csvfile: Path,
+                           parallel = True,
+                           chunksize = 100):
+    # 2024-05-15 Todo
+    # User testing observed that inconsistent filenames may result in inconsistent
+    # column alignment in CSV mode. Workaround is to change chunksize=None.
+    gather = gather_sim_data(study, queryfile, parallel)
+    with open(csvfile, 'w', newline='') as f:
+        if chunksize is None:
+            # Get all records at once to gaurantee headers are the same for all rows
+            records = list(gather)
+            df_sim_data = pd.DataFrame.from_records(records)
+            df_sim_data.to_csv(f, index=False)
+        else:
+            for i,records in enumerate(batched(gather, chunksize)):
+                df_sim_data = pd.DataFrame.from_records(records)
+                df_sim_data.to_csv(f, index=False, header=(i==0))
+
+def gather_sim_data_to_sqlite(study: Path, queryfile: Path, sqlfile: Path,
+                              parallel = True,
+                              chunksize = 100):
+    gather = gather_sim_data(study, queryfile, parallel)
+    with connect(sqlfile) as conn:
+        conn.execute('DROP TABLE IF EXISTS "sim_data";')
+        if chunksize is None:
+            # Get all records at once to gaurantee headers are the same for all rows
+            records = list(gather)
+            df_sim_data = pd.DataFrame.from_records(records)
+            df_sim_data.to_sql('sim_data', conn, index=False)
+        else:
+            for i,records in enumerate(batched(gather, chunksize)):
+                df_sim_data = pd.DataFrame.from_records(records)
+                df_sim_data.to_sql('sim_data', conn, index=False, if_exists='append')
+
+def build_cli_parser(parser: argparse.ArgumentParser,
+                     study_kwargs = {},
+                     queryfile_kwargs = {},
+                     #outputfile_kwargs = {}
+                     ):
+    parser.add_argument('study', type=Path, nargs='?', default='.',
+                        help=r'Analysis subfolder, e.g. C:\Users\user1\Desktop\DEER-EnergyPlus-Prototypes\Analysis\SFm_Furnace_1975',
+                        **study_kwargs)
+    parser.add_argument('-q','--queryfile', type=Path, default='query.txt',
+                        help=r'Query file, e.g. query.txt',
+                        **queryfile_kwargs)
+    #parser.add_argument('-o','--output', type=Path, default='simdata.csv',
+    #                    help=r'Output file, e.g. simdata.csv',
+    #                    **outputfile_kwargs)
+    parser.add_argument('-P', '--parallel', action='store_false', help='Disable parallel mode.')
+    parser.add_argument('-s', '--sqlite', action='store_true', help='Write output in SQLite format.')
+
+def cli_main():
+    """Starts the script on command line."""
+    parser = argparse.ArgumentParser()
+    build_cli_parser(parser)
+    pargs = parser.parse_args()
+    if pargs.sqlite:
+        gather_sim_data_to_sqlite(pargs.study, pargs.queryfile, 'simdata.sqlite', pargs.parallel)
+    else:
+        gather_sim_data_to_csv(pargs.study, pargs.queryfile, 'simdata.csv', pargs.parallel)
+
+def gooey_main():
+    """Opens a window for user to input options and start the script."""
+    import gooey
+    parser = gooey.GooeyParser()
+    # Gooey is not compatible with Tqdm progress bar without more changes.
+    build = gooey.Gooey(build_cli_parser, progress_regex=r"\| (?P<current>\d+)/(?P<total>\d+) \[")
+    build(parser,
+          study_kwargs = dict(widget='DirChooser'),
+          queryfile_kwargs = dict(widget='FileChooser'),
+          #outputfile_kwargs = dict(widget='FileChooser')
+          )
+    pargs = parser.parse_args()
+    if pargs.sqlite:
+        gather_sim_data_to_sqlite(pargs.study, pargs.queryfile, 'simdata.sqlite', pargs.parallel)
+    else:
+        gather_sim_data_to_csv(pargs.study, pargs.queryfile, 'simdata.csv', pargs.parallel)
+
+def test():
+    """Starts the script with hard-coded options."""
+    #study = Path(r'C:\DEER2026\SWHC012-nick\commercial measures\SWHC012-04 Occupancy Sensor')
+    study = Path(r'C:\DEER2026\nf_com_testing_dhw\commercial measures\SWXX000-00 Measure Name')
+    queryfile = Path(r'..\querylibrary\query_default.txt')
+    gather_sim_data_to_csv(study, queryfile, 'simdata.csv', parallel=False)
+
+if "__main__" == __name__:
+    cli_main()
+    #gooey_main()
+    #test()
diff --git a/commercial measures/SWHC046-06 Pkg HP AC Com/result_filtered.py b/commercial measures/SWHC046-06 Pkg HP AC Com/result_filtered.py
new file mode 100644
index 000000000..915fb1808
--- /dev/null
+++ b/commercial measures/SWHC046-06 Pkg HP AC Com/result_filtered.py	
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Wed Apr 17 08:27:33 2024
+
+@author: afshin faramarzi
+"""
+
+# -*- coding: utf-8 -*-
+"""
+Created on Wed Apr 17 07:56:49 2024
+
+@author: afshin faramarzi
+"""
+
+import pandas as pd
+
+class CoilListProcessor:
+    def __init__(self, normunit, excel_file_path, sizing_detail_csv):
+        self.normunit = normunit
+        self.excel_file_path = excel_file_path
+        self.sizing_detail_csv = sizing_detail_csv
+    
+    def read_data(self):
+        # Read coil list Excel file and sizing detail CSV file
+        self.coil_list_df = pd.read_excel(self.excel_file_path)
+        self.sim_sizing_data = pd.read_csv(self.sizing_detail_csv)
+    
+    def process_data(self):
+        # Convert 'Value' column to numeric, forcing errors to NaNs
+        self.sim_sizing_data['Value'] = pd.to_numeric(self.sim_sizing_data['Value'], errors='coerce')
+        
+        # Drop rows with NaN 'Value'
+        self.sim_sizing_data.dropna(subset=['Value'], inplace=True)
+
+        # Extract building prototype from file name
+        self.sim_sizing_data['building type'] = self.sim_sizing_data['File Name'].str.extract(r'/([A-Za-z0-9]+)&')
+        
+        # Merge the sizing detail data with the coil list data based on row name and building type
+        self.df_filtered = pd.merge(self.sim_sizing_data,
+                                    self.coil_list_df,
+                                    left_on=['RowName', self.sim_sizing_data['building type'].str.lower()],
+                                    right_on=['object name', self.coil_list_df['building type'].str.lower()])
+        
+        # Aggregate the filtered dataframe by adding up desired normunits based on file names
+        # Outputs a pandas.Series indexed by filename
+        series_agg_values = self.df_filtered.groupby(['File Name'])['Value'].sum()
+        series_agg_values.name = self.normunit
+        # Drop the index to a regular column named 'File Name'
+        # Outputs a pandas.DataFrame
+        df1 = series_agg_values.reset_index()
+
+        # Get additional metadata from filename based on DEER prototypes conventions
+        # Outputs a pandas.DataFrame
+        pattern = r'(?P<BldgLoc>CZ\d\d)/(?P<BldgType>\w+)&(?P<Story>\w+)&(?P<BldgHVAC>\w+)&(?P<BldgVint>\w+)&(?P<TechGroup>\w+)__(?P<TechType>\w+)/(?P<TechID>[^/]+)/instance.*'
+        #pattern = r'(?P<BldgLoc>CZ\d\d)/(?P<Cohort>[^/]+)/(?P<Case>[^/]+)/instance.*'
+        df2 = df1['File Name'].str.extract(pattern)
+        df2.set_index(df1.index)
+        self.sizing_agg_filtered = pd.concat([df1, df2],axis=1)
+        
+    def save_processed_data(self, output_csv):
+        # Save the aggregated data to a CSV file
+        self.sizing_agg_filtered.to_csv(output_csv, index=False)
+
+
+def process_coil_list(normunit, excel_file_path, sizing_detail_csv, output_csv):
+    # Initialize and process data using CoilListProcessor class
+    processor = CoilListProcessor(normunit, excel_file_path, sizing_detail_csv)
+    print(f"Reading from '{excel_file_path}' and '{sizing_detail_csv}' ...")
+    processor.read_data()
+    print(f"Filtering objects and calculating aggregated sum ...")
+    processor.process_data()
+    print(f"Writing '{output_csv}' ...")
+    processor.save_processed_data(output_csv)
+    print("Done.")
+
+# Example usage:
+if __name__ == "__main__":
+    normunit = "Cooling Capacity (W)"
+    excel_file_path = 'coil_list.xlsx'
+
+
+    sizing_detail_csv = 'SWHC046-06 Pkg HP AC Com_Ex/results-sizing-detail.csv'
+    output_csv = 'SWHC046-06 Pkg HP AC Com_Ex/sizing_agg_filtered.csv'
+    process_coil_list(normunit, excel_file_path, sizing_detail_csv, output_csv)
+
+    sizing_detail_csv = 'SWHC046-06 Pkg HP AC Com_Htl_Ex/results-sizing-detail.csv'
+    output_csv = 'SWHC046-06 Pkg HP AC Com_Htl_Ex/sizing_agg_filtered.csv'
+    process_coil_list(normunit, excel_file_path, sizing_detail_csv, output_csv)
diff --git a/scripts/data transformation/Com.py b/scripts/data transformation/Com.py
index 4fe3c902f..aa4c8f044 100644
--- a/scripts/data transformation/Com.py	
+++ b/scripts/data transformation/Com.py	
@@ -498,7 +498,10 @@ def end_use_rearrange(df_in):
     unit_table = unit_lookup[unit_lookup['Normunit']=='Each'][['Normunit','Value']]
     sim_annual_v2 = pd.merge(sim_annual_v1, unit_table, on='Normunit')
 else:
-    sim_annual_v2 = pd.merge(sim_annual_v1, unit_lookup, on='Normunit')
+    # Revised 2025-09-25 by Nicholas Fette to resolve KeyError: 'BldgType'
+    # Both sim_annual_v1 and unit_lookup have BldgType column when normunit != Each.
+    # If "join on" columns omits BldgType, then sim_annual_v2 gets two columns BldgType_x and BldgType_y.
+    sim_annual_v2 = pd.merge(sim_annual_v1, unit_lookup, on=['Normunit','BldgType'])
 sim_annual_v2['numunits'] = sim_annual_v2['Value']
 
 #%%
diff --git a/templates/energyplus/templates/output.pxt b/templates/energyplus/templates/output.pxt
index 76cf781b0..735163d0e 100644
--- a/templates/energyplus/templates/output.pxt
+++ b/templates/energyplus/templates/output.pxt
@@ -44,6 +44,18 @@ EnergyManagementSystem:Sensor,
   EFC_meter,
   ,
   Electricity:Facility;
+  
+Output:Meter,
+    NaturalGas:Facility,     !- Key Name
+    Hourly;                  !- Reporting Frequency
+
+Output:Meter,
+    Heating:NaturalGas,      !- Key Name
+    Hourly;                  !- Reporting Frequency
+
+Output:Meter,
+    Cooling:Electricity,     !- Key Name
+    Hourly;                  !- Reporting Frequency
 
 
 EnergyManagementSystem:Program,