diff --git a/workflow/tests/base_results/results_simulations_bills.csv b/workflow/tests/base_results/results_simulations_bills.csv
index 1d0840593f..e0126fcf18 100644
--- a/workflow/tests/base_results/results_simulations_bills.csv
+++ b/workflow/tests/base_results/results_simulations_bills.csv
@@ -63,6 +63,7 @@ base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml,1061.63,144.0,633
 base-bldgtype-mf-unit-shared-water-heater-recirc.xml,1061.63,144.0,633.14,0.0,777.14,144.0,140.49,284.49,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-bldgtype-mf-unit-shared-water-heater.xml,1021.74,144.0,593.25,0.0,737.25,144.0,140.49,284.49,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-bldgtype-mf-unit.xml,1241.46,144.0,944.05,0.0,1088.05,144.0,9.41,153.41,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-bldgtype-mf-whole-building-common-spaces.xml,8380.36,864.0,7516.36,0.0,8380.36,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-bldgtype-mf-whole-building.xml,8721.72,864.0,7857.72,0.0,8721.72,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-bldgtype-sfa-unit-2stories.xml,1726.26,144.0,1257.88,0.0,1401.88,144.0,180.38,324.38,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 base-bldgtype-sfa-unit-atticroof-cathedral.xml,2280.24,144.0,1359.48,0.0,1503.48,144.0,632.76,776.76,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/workflow/tests/base_results/results_simulations_energy.csv b/workflow/tests/base_results/results_simulations_energy.csv
index 235d096603..ecd15a266c 100644
--- a/workflow/tests/base_results/results_simulations_energy.csv
+++ b/workflow/tests/base_results/results_simulations_energy.csv
@@ -63,6 +63,7 @@ base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml,30.815,30.815,17.
 base-bldgtype-mf-unit-shared-water-heater-recirc.xml,30.815,30.815,17.394,17.394,13.42,0.0,0.0,0.0,0.0,0.0,0.0,0.012,0.0,0.0,2.845,0.397,0.0,1.096,0.0,2.025,0.0,0.206,0.0,0.0,0.0,0.0,2.178,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,2.795,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.109,0.0,12.312,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-bldgtype-mf-unit-shared-water-heater.xml,29.719,29.719,16.298,16.298,13.42,0.0,0.0,0.0,0.0,0.0,0.0,0.012,0.0,0.0,2.845,0.397,0.0,0.0,0.0,2.025,0.0,0.206,0.0,0.0,0.0,0.0,2.178,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,2.795,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.109,0.0,12.312,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-bldgtype-mf-unit.xml,26.835,26.835,25.936,25.936,0.899,0.0,0.0,0.0,0.0,0.0,0.0,0.01,0.0,0.0,2.931,0.415,9.527,0.0,0.0,2.025,0.0,0.206,0.0,0.0,0.0,0.0,2.186,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,2.795,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.899,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-bldgtype-mf-whole-building-common-spaces.xml,206.497,206.497,206.497,206.497,0.0,0.0,0.0,0.0,0.0,0.0,32.468,0.0,0.0,0.0,13.382,0.0,55.855,0.0,0.0,14.641,0.0,1.364,0.0,0.0,0.0,0.0,12.516,0.0,0.0,1.912,2.192,0.0,9.172,0.0,12.693,50.302,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-bldgtype-mf-whole-building.xml,215.875,215.875,215.875,215.875,0.0,0.0,0.0,0.0,0.0,0.0,32.319,0.0,0.0,0.0,22.984,0.0,55.564,0.0,0.0,14.641,0.0,1.364,0.0,0.0,0.0,0.0,12.732,0.0,0.0,1.912,2.192,0.0,9.172,0.0,12.693,50.302,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-bldgtype-sfa-unit-2stories.xml,51.789,51.789,34.558,34.558,17.231,0.0,0.0,0.0,0.0,0.0,0.0,0.337,0.0,0.0,3.51,0.496,9.075,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,17.231,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-bldgtype-sfa-unit-atticroof-cathedral.xml,97.796,97.796,37.349,37.349,60.447,0.0,0.0,0.0,0.0,0.0,0.0,1.182,0.0,0.0,5.195,0.778,9.083,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.045,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,60.447,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/workflow/tests/base_results/results_simulations_hvac.csv b/workflow/tests/base_results/results_simulations_hvac.csv
index 97ee0b80a9..73fc08aece 100644
--- a/workflow/tests/base_results/results_simulations_hvac.csv
+++ b/workflow/tests/base_results/results_simulations_hvac.csv
@@ -63,6 +63,7 @@ base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml,6.8,91.76,12000.0
 base-bldgtype-mf-unit-shared-water-heater-recirc.xml,6.8,91.76,12000.0,12000.0,0.0,5708.0,0.0,2576.0,0.0,287.0,1490.0,0.0,0.0,0.0,0.0,1354.0,0.0,0.0,7061.0,0.0,2478.0,0.0,103.0,190.0,0.0,0.0,0.0,0.0,183.0,0.0,3320.0,0.0,786.0,605.0,0.0,-195.0,0.0,800.0
 base-bldgtype-mf-unit-shared-water-heater.xml,6.8,91.76,12000.0,12000.0,0.0,5708.0,0.0,2576.0,0.0,287.0,1490.0,0.0,0.0,0.0,0.0,1354.0,0.0,0.0,7061.0,0.0,2478.0,0.0,103.0,190.0,0.0,0.0,0.0,0.0,183.0,0.0,3320.0,0.0,786.0,605.0,0.0,-195.0,0.0,800.0
 base-bldgtype-mf-unit.xml,6.8,91.76,12000.0,12000.0,0.0,5708.0,0.0,2576.0,0.0,287.0,1490.0,0.0,0.0,0.0,0.0,1354.0,0.0,0.0,7061.0,0.0,2478.0,0.0,103.0,190.0,0.0,0.0,0.0,0.0,183.0,0.0,3320.0,0.0,786.0,605.0,0.0,-195.0,0.0,800.0
+base-bldgtype-mf-whole-building-common-spaces.xml,6.8,91.76,36000.0,36000.0,0.0,130268.0,0.0,12012.0,0.0,1148.0,18153.0,0.0,22858.0,17092.0,16340.0,42666.0,0.0,0.0,59621.0,0.0,11260.0,0.0,412.0,2071.0,0.0,9578.0,0.0,7473.0,5784.0,0.0,19920.0,0.0,3124.0,-1342.0,0.0,-6142.0,0.0,4800.0
 base-bldgtype-mf-whole-building.xml,6.8,91.76,72000.0,72000.0,0.0,80746.0,0.0,18018.0,0.0,1722.0,10488.0,0.0,2376.0,0.0,3860.0,44282.0,0.0,0.0,52322.0,0.0,16890.0,0.0,618.0,1338.0,0.0,630.0,0.0,2244.0,5992.0,0.0,19920.0,0.0,4686.0,-1564.0,0.0,-6364.0,0.0,4800.0
 base-bldgtype-sfa-unit-2stories.xml,6.8,91.76,48000.0,36000.0,0.0,26789.0,7510.0,5147.0,0.0,575.0,5679.0,0.0,0.0,1286.0,1447.0,5144.0,0.0,0.0,17853.0,5094.0,4954.0,0.0,207.0,476.0,0.0,0.0,0.0,1529.0,699.0,0.0,3320.0,0.0,1573.0,57.0,0.0,-743.0,0.0,800.0
 base-bldgtype-sfa-unit-atticroof-cathedral.xml,6.8,91.76,48000.0,36000.0,0.0,42377.0,0.0,3210.0,0.0,575.0,4513.0,27649.0,0.0,1286.0,0.0,5144.0,0.0,0.0,24067.0,0.0,3408.0,0.0,207.0,327.0,14551.0,0.0,0.0,0.0,699.0,0.0,3320.0,0.0,1555.0,57.0,0.0,-743.0,0.0,800.0
diff --git a/workflow/tests/base_results/results_simulations_loads.csv b/workflow/tests/base_results/results_simulations_loads.csv
index 78865b7d7b..4a11b455c7 100644
--- a/workflow/tests/base_results/results_simulations_loads.csv
+++ b/workflow/tests/base_results/results_simulations_loads.csv
@@ -63,6 +63,7 @@ base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml,1.029,0.0,8.024,9
 base-bldgtype-mf-unit-shared-water-heater-recirc.xml,1.029,0.0,8.024,9.37,0.574,0.0,0.0,0.0,-0.003,1.757,0.0,0.0,0.282,2.551,-1.822,0.0,0.0,0.005,0.0,-0.297,0.996,0.0,0.458,0.0,0.0,-2.47,-0.505,0.0,0.001,-1.843,0.0,0.0,-0.214,-2.458,6.38,0.0,0.0,0.01,0.0,-0.289,-1.121,-1.36,-0.574,0.0,0.0,8.196,1.52
 base-bldgtype-mf-unit-shared-water-heater.xml,1.029,0.0,8.024,9.37,0.574,0.0,0.0,0.0,-0.003,1.757,0.0,0.0,0.282,2.551,-1.822,0.0,0.0,0.005,0.0,-0.297,0.996,0.0,0.458,0.0,0.0,-2.47,-0.505,0.0,0.001,-1.843,0.0,0.0,-0.214,-2.458,6.38,0.0,0.0,0.01,0.0,-0.289,-1.121,-1.36,-0.574,0.0,0.0,8.196,1.52
 base-bldgtype-mf-unit.xml,0.834,0.0,8.366,9.37,0.58,0.0,0.0,0.0,-0.002,1.627,0.0,0.0,0.262,2.355,-1.638,0.0,0.0,0.007,0.0,-0.273,0.727,0.0,0.423,0.0,0.0,-2.279,-0.457,0.0,0.003,-2.012,0.0,0.0,-0.242,-2.717,6.565,0.0,0.0,0.012,0.0,-0.265,-0.898,-1.393,-0.62,0.0,0.0,8.603,1.568
+base-bldgtype-mf-whole-building-common-spaces.xml,32.437,0.0,31.507,55.441,3.667,0.0,0.0,0.0,9.498,5.325,0.448,5.96,0.718,8.557,-9.258,0.0,0.0,11.097,5.798,-0.509,24.965,0.0,0.0,0.0,0.0,-26.422,-3.949,0.0,4.247,-0.654,0.031,1.497,-0.069,-1.604,9.863,0.0,0.0,4.242,-4.418,-0.526,-5.994,-3.157,0.0,0.0,0.0,24.833,3.372
 base-bldgtype-mf-whole-building.xml,32.265,0.0,51.261,55.316,3.602,0.0,0.0,0.0,7.441,17.359,0.0,0.0,2.293,25.631,-23.055,0.0,0.0,6.568,0.0,-2.946,48.223,0.0,0.0,0.0,0.0,-43.29,-6.251,0.0,-1.631,-5.769,0.0,0.0,-0.312,-6.699,34.307,0.0,0.0,-5.103,0.0,-2.921,-17.611,-8.812,0.0,0.0,0.0,57.959,8.39
 base-bldgtype-sfa-unit-2stories.xml,16.182,0.0,10.166,9.106,0.614,0.0,0.0,0.0,2.643,5.423,0.318,4.405,0.687,7.617,-9.228,0.0,0.0,0.0,4.959,-0.137,7.161,0.0,0.775,0.0,2.473,-8.499,-2.679,0.0,0.069,-0.28,-0.005,1.658,0.033,-0.52,7.268,0.0,0.0,0.0,-4.015,-0.133,-1.149,-2.912,-0.112,0.0,1.403,7.083,1.828
 base-bldgtype-sfa-unit-atticroof-cathedral.xml,56.759,0.0,15.849,9.106,0.623,0.0,0.0,51.613,0.0,3.035,0.299,3.177,0.705,5.042,-5.695,0.0,0.0,0.0,2.818,-1.349,7.398,0.0,0.812,0.0,0.0,-9.358,-2.888,10.542,0.0,-0.064,0.014,1.014,0.156,0.357,4.715,0.0,0.0,0.0,-4.893,-1.312,-0.504,-1.14,-0.049,0.0,0.0,6.205,1.619
diff --git a/workflow/tests/base_results/results_simulations_misc.csv b/workflow/tests/base_results/results_simulations_misc.csv
index 825546a4f7..1fa72a4af5 100644
--- a/workflow/tests/base_results/results_simulations_misc.csv
+++ b/workflow/tests/base_results/results_simulations_misc.csv
@@ -63,6 +63,7 @@ base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml,0.0,0.0,1354.7,99
 base-bldgtype-mf-unit-shared-water-heater-recirc.xml,0.0,0.0,1354.7,998.0,11171.6,3093.4,943.5,1655.2,1655.2,4.039,7.78,0.0
 base-bldgtype-mf-unit-shared-water-heater.xml,0.0,0.0,1354.7,998.0,11171.6,3093.4,906.8,1618.6,1618.6,4.039,7.78,0.0
 base-bldgtype-mf-unit.xml,0.0,0.0,1354.7,998.0,11171.5,3093.4,1600.2,2088.7,2088.7,3.848,7.747,0.0
+base-bldgtype-mf-whole-building-common-spaces.xml,149.0,25.0,8128.5,5988.0,67057.3,17085.8,19756.7,13517.6,19756.7,32.129,24.769,0.0
 base-bldgtype-mf-whole-building.xml,0.0,0.0,8128.5,5988.0,67057.1,16864.7,22885.4,16302.4,22885.4,54.121,56.256,0.0
 base-bldgtype-sfa-unit-2stories.xml,0.0,0.0,1354.7,998.0,11171.5,2624.7,2042.1,3164.6,3164.6,18.235,15.439,0.0
 base-bldgtype-sfa-unit-atticroof-cathedral.xml,0.0,0.0,1354.7,998.0,11171.6,2624.7,2159.1,4538.1,4538.1,36.735,28.677,0.0