diff --git a/README.md b/README.md
index f1de7241a..a97270b1f 100644
--- a/README.md
+++ b/README.md
@@ -264,7 +264,7 @@ The capacity planning framework replaces an earlier spreadsheet method with
 Importing the framework:
 
 ``` python
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling \
+from powersimdata.design.clean_capacity_scaling \
     import CollaborativeStrategyManager, IndependentStrategyManager, \
         TargetManager, ResourceManager, Resource
 ```
diff --git a/powersimdata/__init__.py b/powersimdata/__init__.py
index cf0c1de5a..076a665d5 100644
--- a/powersimdata/__init__.py
+++ b/powersimdata/__init__.py
@@ -1 +1 @@
-__all__ = ['input', 'output', 'scenario','scaling']
+__all__ = ['design','input', 'output', 'scenario']
diff --git a/powersimdata/design/__init__.py b/powersimdata/design/__init__.py
new file mode 100644
index 000000000..312e332e3
--- /dev/null
+++ b/powersimdata/design/__init__.py
@@ -0,0 +1 @@
+__all__ = ['demo','tests']
diff --git a/powersimdata/scaling/clean_capacity_scaling/auto_capacity_scaling.py b/powersimdata/design/clean_capacity_scaling.py
similarity index 77%
rename from powersimdata/scaling/clean_capacity_scaling/auto_capacity_scaling.py
rename to powersimdata/design/clean_capacity_scaling.py
index dac6c7f9d..9e476293e 100644
--- a/powersimdata/scaling/clean_capacity_scaling/auto_capacity_scaling.py
+++ b/powersimdata/design/clean_capacity_scaling.py
@@ -1,4 +1,4 @@
-from powersimdata.scenario.scenario_info import ScenarioInfo
+from powersimdata.design.scenario_info import ScenarioInfo
 import pandas as pd
 import jsonpickle
 import json
@@ -17,16 +17,16 @@ def __init__(self):
 
     @staticmethod
     def set_next_sim_hours(next_sim_hours):
-        """
-        Sets the number of hours in the simulation for next capacity
-        calculations
+        """Sets the number of hours in the simulation for next capacity
+        calculations.
+
         :param int next_sim_hours: number of hours in the simulation
         """
         AbstractStrategyManager.next_sim_hours = next_sim_hours
 
     def targets_from_data_frame(self, data_frame):
-        """
-        Bulk creates target objects from dataframe
+        """Creates target objects from data frame.
+
         :param (*pandas.DataFrame*) data_frame: external target information
         """
         for row in data_frame.itertuples():
@@ -51,10 +51,10 @@ def targets_from_data_frame(self, data_frame):
 
     def populate_targets_with_resources(self, scenario_info, start_time,
                                         end_time):
-        """
-        Add resource objects to all targets with a strategy from a
-        specified scenario
-        :param powersimdata.scenario.scenario_info.ScenarioInfo scenario_info:
+        """Adds resource objects to all targets with a strategy from a
+        specified scenario.
+
+        :param powersimdata.design.scenario_info.ScenarioInfo scenario_info:
         ScenarioInfo object to calculate scenario resource properties
         :param str start_time: starting datetime for interval of interest
         :param str end_time: ending datetime for interval of interest
@@ -74,9 +74,9 @@ def populate_targets_with_resources(self, scenario_info, start_time,
                                                              end_time)
 
     def add_target(self, target_manager_obj):
-        """
-        Add target to strategy object
-        :param target_manager_obj: target object to be added
+        """Adds target to strategy object.
+
+        :param TargetManager target_manager_obj: target object to be added.
         """
         assert (isinstance(target_manager_obj, TargetManager)), \
             "Input must be of TargetManager type"
@@ -84,14 +84,14 @@ def add_target(self, target_manager_obj):
 
     @staticmethod
     def load_target_from_json(target_name):
-        """
-        Loads JSON file of given target
-        :param str target_name: name of target to be loaded
-        :return: instance of TargetManager class
+        """Loads JSON file of given target.
+
+        :param str target_name: name of target to be loaded.
+        :return: (*TargetManager*) -- instance of TargetManager class
         """
         json_file = open(os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            "save_files",
+            "demo", "data", "save_files",
             target_name+".json"), "r")
         target_obj = jsonpickle.decode(json_file.read())
         json_file.close()
@@ -99,14 +99,14 @@ def load_target_from_json(target_name):
 
     @staticmethod
     def load_target_from_pickle(target_name):
-        """
-        Loads pickle file of given target
+        """Loads pickle file of given target.
+
         :param str target_name: name of target to be loaded
-        :return: instance of TargetManager class
+        :return: (*TargetManager*) -- instance of TargetManager class
         """
         json_file = open(os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            "save_files", target_name+".pkl"),
+            "demo", "data", "save_files", target_name+".pkl"),
             "rb")
         target_obj = pickle.load(json_file)
         json_file.close()
@@ -114,18 +114,18 @@ def load_target_from_pickle(target_name):
 
 
 class IndependentStrategyManager(AbstractStrategyManager):
-    """
-    Calculates the next capacities using individual target shortfalls
+    """Calculates the next capacities using individual target shortfalls.
+
     """
     def __init__(self):
         AbstractStrategyManager.__init__(self)
 
     def set_addl_curtailment(self, additional_curtailment_table):
-        """
-        Sets additional curtailment for a region and particular resource type
-        :param additional_curtailment_table: nested dictionary structure of
-        the form: {‘Alabama’:{‘solar’: .2}, ‘Maryland’: {‘wind’: .1}}
-        The numbers are curtailment factors between 0 and 1.
+        """Sets additional curtailment for a region and particular resource type
+
+        :param dict additional_curtailment_table: nested dictionary structure of
+            the form: {‘Alabama’:{‘solar’: .2}, ‘Maryland’: {‘wind’: .1}}. The
+            numbers are curtailment factors between 0 and 1.
         """
         for region_name, target_obj in additional_curtailment_table.items():
             for resource_name, curtailment_factor in target_obj.items():
@@ -143,9 +143,9 @@ def set_addl_curtailment(self, additional_curtailment_table):
                         f"{resource_name} not found***") from e
 
     def data_frame_of_next_capacities(self):
-        """
-        Gathers next target capacity information into a dataframe
-        :return: data frame of next target capacities
+        """Gathers next target capacity information into a data frame.
+
+        :return: (*pandas.DataFrame*) -- data frame of next target capacities.
         """
         target_capacities = []
         for tar in self.targets:
@@ -194,19 +194,18 @@ def data_frame_of_next_capacities(self):
 
 
 class CollaborativeStrategyManager(AbstractStrategyManager):
-    """
-    Calculates the next capacities using total target shortfalls
+    """Calculates the next capacities using total target shortfalls.
+
     """
     def __init__(self):
         self.addl_curtailment = {"solar": 0, "wind": 0}
         AbstractStrategyManager.__init__(self)
 
     def set_collab_addl_curtailment(self, addl_curtailment):
-        """
-        Set additional curtailment for Collaborative Strategy
-        Must be a dictionary with "solar" and "wind" keys defined:
-        {"solar": .2, "wind": .3}
-        with values between 0 and 1.
+        """Sets additional curtailment for Collaborative Strategy
+
+        :param dict addl_curtailment: dictionary with '*solar*' and '*wind*'
+            keys defined: {"solar": .2, "wind": .3} with values between 0 and 1.
         """
         assert set(addl_curtailment.keys()) == set(["solar", "wind"])
         assert 0 <= addl_curtailment["solar"] <= 1, "solar additional " \
@@ -218,9 +217,9 @@ def set_collab_addl_curtailment(self, addl_curtailment):
         self.addl_curtailment = addl_curtailment
 
     def calculate_total_shortfall(self):
-        """
-        Calculate total clean energy shortfall
-        :return: total clean energy shortfall
+        """Calculates total clean energy shortfall.
+
+        :return: (*float*) -- total clean energy shortfall
         """
         total_ce_shortfall = 0
         for name, target in self.targets.items():
@@ -229,9 +228,9 @@ def calculate_total_shortfall(self):
         return total_ce_shortfall
 
     def calculate_total_prev_ce_generation(self):
-        """
-        Calculate total allowed clean energy generation
-        :return: total allowed clean energy generation
+        """Calculates total allowed clean energy generation
+
+        :return: (*float*) -- total allowed clean energy generation
         """
         total_prev_ce_generation = 0
         for tar in self.targets:
@@ -240,11 +239,11 @@ def calculate_total_prev_ce_generation(self):
         return total_prev_ce_generation
 
     def calculate_total_added_capacity(self, solar_fraction=None):
-        """
-        Calculate the capacity to add from total clean energy shortfall
-        :param solar_fraction: solar fraction to be used in calculation,
-        default is to maintain from previous result
-        :return: solar and wind added capacities
+        """Calculates the capacity to add from total clean energy shortfall.
+
+        :param float solar_fraction: solar fraction to be used in calculation,
+            default is to maintain from previous result
+        :return: (*tuple*) -- solar and wind added capacities
         """
         solar_prev_capacity = self.calculate_total_capacity('solar')
         wind_prev_capacity = self.calculate_total_capacity('wind')
@@ -274,11 +273,11 @@ def calculate_total_added_capacity(self, solar_fraction=None):
         return solar_added_capacity, wind_added_capacity
 
     def calculate_total_added_capacity_gen_constant(self, solar_fraction=None):
-        """
-        Calculate the capacity to add from total clean energy shortfall
-        :param solar_fraction: solar fraction to be used in calculation,
-        default is to maintain from previous result
-        :return: solar and wind added capacities
+        """Calculates the capacity to add from total clean energy shortfall.
+
+        :param (*float*) solar_fraction: solar fraction to be used in
+            calculation, default is to maintain from previous result
+        :return: (*tuple*) -- solar and wind added capacities
         """
         solar_prev_capacity = self.calculate_total_capacity('solar')
         wind_prev_capacity = self.calculate_total_capacity('wind')
@@ -307,10 +306,10 @@ def calculate_total_added_capacity_gen_constant(self, solar_fraction=None):
         return solar_added_capacity, wind_added_capacity
 
     def calculate_total_capacity(self, category):
-        """
-        Calculate total capacity for a resource
-        :param category: resource category
-        :return: total capacity for a resource
+        """Calculates total capacity for a resource.
+
+        :param str category: resource category.
+        :return: (*float*) -- total capacity for a resource.
         """
         total_prev_capacity = 0
         for tar in self.targets:
@@ -319,10 +318,10 @@ def calculate_total_capacity(self, category):
         return total_prev_capacity
 
     def calculate_total_generation(self, category):
-        """
-        Calculate total generation for a resource
-        :param category: resource category
-        :return: total generation for a resource
+        """Calculates total generation for a resource.
+
+        :param str category: resource category.
+        :return: (*float*) -- total generation for a resource.
         """
         total_prev_generation = 0
         for tar in self.targets:
@@ -331,10 +330,10 @@ def calculate_total_generation(self, category):
         return total_prev_generation
 
     def calculate_total_capacity_factor(self, category):
-        """
-        Calculate total capacity factor for a target_manager_obj resource
-        :param category: resource category
-        :return: total capacity factor
+        """Calculates total capacity factor for a resource.
+
+        :param str category: resource category.
+        :return: (*float*) -- total capacity factor.
         """
         # revisit where hourly factor comes from
         total_cap_factor = self.calculate_total_generation(category) / \
@@ -342,11 +341,10 @@ def calculate_total_capacity_factor(self, category):
         return total_cap_factor
 
     def calculate_total_expected_capacity_factor(self, category):
-        """
-        Calculate the total expected capacity for a target_manager_obj resource
-        :param category: resource category
-        :param addl_curtailment: option to add additional curtailment
-        :return: total expected capacity factor
+        """Calculates the total expected capacity for a resource.
+
+        :param str category: resource category.
+        :return: (*float*) -- total expected capacity factor
         """
         assert (category in ["solar", "wind"]), " expected capacity factor " \
                                                 "only defined for solar and " \
@@ -357,9 +355,9 @@ def calculate_total_expected_capacity_factor(self, category):
         return total_exp_cap_factor
 
     def calculate_capacity_scaling(self):
-        """
-        Calculate the aggregate capacity scaling factor for solar and wind
-        :return: solar and wind capacity scaling factors
+        """Calculates the aggregate capacity scaling factor for solar and wind.
+
+        :return: (*tuple*) -- solar and wind capacity scaling factors
         """
         solar_prev_capacity = self.calculate_total_capacity('solar')
         wind_prev_capacity = self.calculate_total_capacity('wind')
@@ -370,9 +368,9 @@ def calculate_capacity_scaling(self):
         return solar_scaling, wind_scaling
 
     def data_frame_of_next_capacities(self):
-        """
-        Gathers next target capacity information into a dataframe
-        :return: data frame of next target capacities
+        """Gathers next target capacity information into a data frame.
+
+        :return: (*pandas.DataFrame*) -- data frame of next target capacities
         """
         solar_scaling, wind_scaling = self.calculate_capacity_scaling()
 
@@ -414,13 +412,14 @@ class TargetManager:
     def __init__(self, region_name, ce_target_fraction, ce_category,
                  total_demand, external_ce_historical_amount=0,
                  solar_percentage=None):
-        """
-        Class manages the regional target_manager_obj data and calculations
-        :param region_name: region region_name
-        :param ce_target_fraction: target_manager_obj fraction for clean energy
-        :param ce_category: type of energy target_manager_obj, i.e. renewable,
-        clean energy, etc.
-        :param total_demand: total demand for region
+        """Manages the regional data and calculations.
+
+        :param str region_name: region region_name
+        :param float ce_target_fraction: target_manager_obj fraction for clean
+            energy
+        :param str ce_category: type of energy target_manager_obj, i.e.
+            renewable, clean energy, etc.
+        :param float total_demand: total demand for region
         """
         assert (type(region_name) == str), "region_name must be a string"
         assert (type(ce_category) == str), "ce_category must be a string"
@@ -451,12 +450,12 @@ def __init__(self, region_name, ce_target_fraction, ce_category,
 
     def populate_resource_info(self, scenario_info,
                                start_time, end_time):
-        """
-        Add resource objects to target using a specified scenario
-        :param powersimdata.scenario.scenario_info.ScenarioInfo scenario_info:
-        ScenarioInfo object to calculate scenario resource properties
-        :param str start_time: starting datetime for interval of interest
-        :param str end_time: ending datetime for interval of interest
+        """Adds resource objects to target using a specified scenario.
+
+        :param powersimdata.design.scenario_info.ScenarioInfo scenario_info:
+            ScenarioInfo object to calculate scenario resource properties.
+        :param str start_time: starting datetime for interval of interest.
+        :param str end_time: ending datetime for interval of interest.
         """
         allowed_resources = set(self.allowed_resources)
         available_resources = set(
@@ -472,9 +471,9 @@ def populate_resource_info(self, scenario_info,
         self.add_resource_manager(resources)
 
     def calculate_added_capacity(self):
-        """
-        Calculate added capacity, maintains solar wind ratio by default
-        :return: tuple of solar and wind added capacity values
+        """Calculates added capacity, maintains solar wind ratio by default.
+
+        :return: (*tuple*) -- solar and wind added capacity values
         """
         solar = self.resources['solar']
         wind = self.resources['wind']
@@ -501,9 +500,9 @@ def calculate_added_capacity(self):
         return solar_added_capacity, wind_added_capacity
 
     def calculate_added_capacity_gen_constant(self):
-        """
-        Calculate added capacity, maintains solar wind ratio by default
-        :return: tuple of solar and wind added capacity values
+        """Calculates added capacity, maintains solar wind ratio by default.
+
+        :return: (*tuple*) -- solar and wind added capacity values.
         """
         solar = self.resources['solar']
         wind = self.resources['wind']
@@ -530,9 +529,9 @@ def calculate_added_capacity_gen_constant(self):
         return solar_added_capacity, wind_added_capacity
 
     def calculate_prev_ce_generation(self):
-        """
-        Calculates total generation from allowed resources
-        :return: total generation from allowed resources
+        """Calculates total generation from allowed resources.
+
+        :return: (*float*) -- total generation from allowed resources
         """
         # prev_ce_generation = the sum of all prev_generation in the list
         # of allowed resources
@@ -543,32 +542,31 @@ def calculate_prev_ce_generation(self):
         return prev_ce_generation
 
     def add_resource(self, resource):
-        """
-        Adds resource to TargetManager
-        :param resource: resource to be added
+        """Adds resource to TargetManager.
+
+        :param Resource resource: resource to be added
         """
         assert (isinstance(resource, Resource)),\
             "Input must be of Resource type"
         self.resources[resource.name] = resource
 
     def add_resource_manager(self, resource_manager):
-        """
-        Sets the resources property equal to a resource manager object which
-        contains scenario resource information
-        :param (powersimdata.scaling.clean_capacity_scaling
-        .auto_capacity_scaling.ResourceManager) resource_manager: resource
-        manager object with scenario resource information
+        """Sets the resources property equal to a resource manager object which
+        contains scenario resource information.
+
+        :param ResourceManager resource_manager: resource manager object with
+            scenario resource information
         """
         assert (isinstance(resource_manager, ResourceManager)),\
             "Input parameter must be an instance of type ResourceManager"
         self.resources = resource_manager
 
     def calculate_ce_shortfall(self):
-        """
-        Calculates the clean energy shortfall for target_manager_obj area,
+        """Calculates the clean energy shortfall for target_manager_obj area,
         subtracts the external value if greater than total allowed clean energy
-        generation
-        :return: clean energy shortfall
+        generation.
+
+        :return: (*float*) -- clean energy shortfall
         """
         prev_ce_generation = self.calculate_prev_ce_generation()
 
@@ -585,11 +583,10 @@ def calculate_ce_shortfall(self):
         return ce_shortfall
 
     def calculate_ce_overgeneration(self):
-        """
-        Calculates the clean energy overgeneration for target_manager_obj
-        area, subtracts from external value if greater than total allowed
-        clean energy generation
-        :return: clean energy overgeneration
+        """Calculates the clean energy over generation, subtracts from external
+            value if greater than total allowed clean energy generation
+
+        :return: (*float*) -- clean energy over generation
         """
         prev_ce_generation = self.calculate_prev_ce_generation()
 
@@ -606,21 +603,22 @@ def calculate_ce_overgeneration(self):
         return ce_overgeneration
 
     def set_allowed_resources(self, allowed_resources):
+        """Sets a list of allowed resources.
+
+        :param list allowed_resources: allowed resources
+
+        .. todo:: input validation
         """
-        Sets a list of allow resources
-        :param allowed_resources: list of allow resources
-        """
-        # todo: input validation
         self.allowed_resources = allowed_resources
 
     def save_target_as_json(self):
-        """
-        Saves target object as indented JSON file named by region name
+        """Saves target object as indented JSON file named by region name.
+
         """
         print(os.getcwd())
         json_file = open(os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            "save_files",
+            "demo", "data", "save_files",
             self.region_name+".json"), "w")
         obj_json = json.dumps(json.loads(jsonpickle.encode(self)), indent=4,
                               sort_keys=True)
@@ -628,21 +626,21 @@ def save_target_as_json(self):
         json_file.close()
 
     def save_target_as_pickle(self):
-        """
-        Saves target object as pickle file named by region name
+        """Saves target object as pickle file named by region name.
+
         """
         print(os.getcwd())
         json_file = open(os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            "save_files",
+            "demo", "data", "save_files",
             self.region_name+".pkl"), "wb")
         pickle.dump(self, json_file)
         json_file.close()
 
     def __str__(self):
-        """
-        Outputs indented JSON string af object properties
-        :return: JSON formatted string
+        """Outputs indented JSON string af object properties.
+
+        :return: (*str*) -- JSON formatted string
         """
         return json.dumps(
             json.loads(jsonpickle.encode(self, unpicklable=False)),
@@ -651,20 +649,20 @@ def __str__(self):
 
 
 class ResourceManager:
-    """
-    Class manages the creation of resource objects from scenario information
+    """Manages the creation of resource objects from scenario information.
+
     """
     def __init__(self):
-        """
-        Creates an empty dictionary to hold resource objects
+        """Creates an empty dictionary to hold resource objects.
+        
         """
         self.resources = {}
 
     def __getitem__(self, key):
-        """
-        Allows indexing into the resources dictionary directly from the
+        """Allows indexing into the resources dictionary directly from the
         object variable, i.e. res = ResourceManager; res["solar"] is the
-        same as res.resources["solar"]
+        same as res.resources["solar"].
+
         :param str key: resource type as string
         :raises KeyError For attempts to use key not in the dictionary
         :return: instance of Resource class
@@ -676,15 +674,15 @@ def __getitem__(self, key):
 
     def pull_region_resource_info(self, region_name, scenario_info,
                                   region_resources, start_time, end_time):
-        """
-        Pulls resource information from scenario info object over the
-        specified time range
+        """Pulls resource information from scenario info object over the
+        specified time range.
+
         :param str region_name: name of region to extract from scenario
-        :param powersimdata.scenario.scenario_info.ScenarioInfo scenario_info:
-        ScenarioInfo object to calculate scenario resource properties
-        :param set region_resources: resources to extract from scenario
-        :param str start_time: starting time for simulation
-        :param str end_time: ending time for simulation
+        :param powersimdata.design.scenario_info.ScenarioInfo scenario_info:
+        ScenarioInfo instance to calculate scenario resource properties
+        :param set region_resources: resources to extract from scenario.
+        :param str start_time: starting time for simulation.
+        :param str end_time: ending time for simulation.
         """
         assert (isinstance(scenario_info, ScenarioInfo)),\
             "input parameter must be an instance of type ScenarioInfo"
@@ -760,14 +758,16 @@ def __init__(self, name, prev_scenario_num):
         self.prev_curtailment = None
         self.addl_curtailment = 0
 
-    # todo: calculate directly from scenario results
     def set_capacity(self, no_congestion_cap_factor, prev_capacity,
                      prev_cap_factor):
-        """
-        Sets capacity information for resource
-        :param no_congestion_cap_factor: capacity factor with no congestion
-        :param prev_capacity: capacity from scenario run
-        :param prev_cap_factor: capacity factor from scenario run
+        """Sets capacity information for resource.
+
+        :param float no_congestion_cap_factor: capacity factor with no
+            congestion.
+        :param float prev_capacity: capacity from scenario run.
+        :param float prev_cap_factor: capacity factor from scenario run.
+
+        .. todo:: calculate directly from scenario results
         """
         assert (0 <= no_congestion_cap_factor <= 1), \
             "no_congestion_cap_factor must be between 0 and 1"
@@ -779,60 +779,60 @@ def set_capacity(self, no_congestion_cap_factor, prev_capacity,
         self.prev_capacity = prev_capacity
         self.prev_cap_factor = prev_cap_factor
 
-    # todo: calculate directly from scenario results
     def set_generation(self, prev_generation, tolerance=1e-3):
+        """Sets generation from scenario run.
+
+        :param float prev_generation: generation from scenario run.
+        :param float tolerance: tolerance for ignored negative values.
+
+        .. todo:: calculate directly from scenario results
         """
-        Set generation from scenario run
-        :param prev_generation: generation from scenario run
-        :param {float, int} tolerance: tolerance for ignored negative values
-        """
-        if ((-1 * tolerance) <= prev_generation < 0):
+        if (-1 * tolerance) <= prev_generation < 0:
             prev_generation = 0
         assert (prev_generation >= 0), \
             f"prev_generation must be greater than zero. Got {prev_generation}"
         self.prev_generation = prev_generation
 
     def set_curtailment(self, prev_curtailment):
-        """
-        Set curtailment from scenario run
-        :param prev_curtailment: calculated curtailment from scenario run
+        """Sets curtailment from scenario run.
+
+        :param float prev_curtailment: calculated curtailment from scenario run.
         """
         assert (prev_curtailment >= 0), \
             "prev_curtailment must be greater than zero"
         self.prev_curtailment = prev_curtailment
 
     def set_addl_curtailment(self, addl_curtailment):
-        """
-        Set additional curtailment to included in capacity calculations
-        :param addl_curtailment: additional curtailment
+        """Sets additional curtailment to include in capacity calculations.
+
+        :param float addl_curtailment: additional curtailment
         """
         assert (0 <= addl_curtailment <= 1), \
             "additional_curtailment must be between 0 and 1"
         self.addl_curtailment = addl_curtailment
 
     def calculate_expected_cap_factor(self):
-        """
-        Calculates the capacity factor including additional curtailment
-        :return: capacity factor for resource
+        """Calculates the capacity factor including additional curtailment.
+
+        :return: (*float*) --capacity factor for resource
         """
         exp_cap_factor = self.prev_cap_factor * (1-self.addl_curtailment)
         return exp_cap_factor
 
     def calculate_next_capacity(self, added_capacity):
-        """
-        Calculates next capacity to be used for scenario
-        :param added_capacity: calculated added capacity
-        :return: next capacity to be used for scenario
+        """Calculates next capacity to be used for scenario.
+
+        :param float added_capacity: calculated added capacity
+        :return: (*float*) -- next capacity to be used for scenario
         """
         next_capacity = self.prev_capacity + added_capacity
         return next_capacity
 
     def __str__(self):
+        """Outputs indented JSON string af object properties
+
+        :return: (*str*) --JSON formatted string
         """
-        Outputs indented JSON string af object properties
-        :return: JSON formatted string
-        """
-        return json.dumps(json.loads(jsonpickle.encode(self,
-                                                       unpicklable=False
-                                                       )),
-                          indent=4, sort_keys=True)
+        return json.dumps(
+            json.loads(jsonpickle.encode(self, unpicklable=False)),
+            indent=4, sort_keys=True)
diff --git a/powersimdata/scaling/clean_capacity_scaling/demo/Eastern Scenario Take 2.csv b/powersimdata/design/demo/data/eastern_2030_clean_energy_targets.csv
similarity index 100%
rename from powersimdata/scaling/clean_capacity_scaling/demo/Eastern Scenario Take 2.csv
rename to powersimdata/design/demo/data/eastern_2030_clean_energy_targets.csv
diff --git a/powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.json b/powersimdata/design/demo/data/save_files/Pacific.json
similarity index 75%
rename from powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.json
rename to powersimdata/design/demo/data/save_files/Pacific.json
index 76159b997..a3147334b 100644
--- a/powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.json
+++ b/powersimdata/design/demo/data/save_files/Pacific.json
@@ -8,7 +8,7 @@
     "ce_target": 50000.0,
     "ce_target_fraction": 0.25,
     "external_ce_historical_amount": 0,
-    "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.TargetManager",
+    "py/object": "powersimdata.design.clean_capacity_scaling.TargetManager",
     "region_name": "Pacific",
     "resources": {
         "geo": {
@@ -20,7 +20,7 @@
             "prev_curtailment": 0,
             "prev_generation": 8000,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         },
         "hydro": {
             "addl_curtailment": 0,
@@ -31,7 +31,7 @@
             "prev_curtailment": 0,
             "prev_generation": 7000,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         },
         "nuclear": {
             "addl_curtailment": 0,
@@ -42,7 +42,7 @@
             "prev_curtailment": 0,
             "prev_generation": 6500,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         },
         "solar": {
             "addl_curtailment": 0,
@@ -53,7 +53,7 @@
             "prev_curtailment": 0.138483,
             "prev_generation": 7000,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         },
         "wind": {
             "addl_curtailment": 0,
@@ -64,7 +64,7 @@
             "prev_curtailment": 0.130363,
             "prev_generation": 11000,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         }
     },
     "solar_percentage": null,
diff --git a/powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.pkl b/powersimdata/design/demo/data/save_files/Pacific.pkl
similarity index 80%
rename from powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.pkl
rename to powersimdata/design/demo/data/save_files/Pacific.pkl
index 4be452460..5b0c1fb2b 100644
Binary files a/powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.pkl and b/powersimdata/design/demo/data/save_files/Pacific.pkl differ
diff --git a/powersimdata/scaling/clean_capacity_scaling/demo/EasternCapacityScaling.ipynb b/powersimdata/design/demo/eastern_clean_capacity_scaling_demo.ipynb
similarity index 96%
rename from powersimdata/scaling/clean_capacity_scaling/demo/EasternCapacityScaling.ipynb
rename to powersimdata/design/demo/eastern_clean_capacity_scaling_demo.ipynb
index a1b3a822a..17b1202ae 100644
--- a/powersimdata/scaling/clean_capacity_scaling/demo/EasternCapacityScaling.ipynb
+++ b/powersimdata/design/demo/eastern_clean_capacity_scaling_demo.ipynb
@@ -7,8 +7,9 @@
    "outputs": [],
    "source": [
     "from powersimdata.scenario.scenario import Scenario\n",
-    "from powersimdata.scenario.scenario_info import ScenarioInfo\n",
+    "from powersimdata.design.scenario_info import ScenarioInfo\n",
     "import json\n",
+    "import os\n",
     "import pandas as pd"
    ]
   },
@@ -18,7 +19,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling import CollaborativeStrategyManager,\\\n",
+    "from powersimdata.design.clean_capacity_scaling import CollaborativeStrategyManager,\\\n",
     "IndependentStrategyManager, TargetManager, ResourceManager, Resource"
    ]
   },
@@ -29,7 +30,7 @@
    "outputs": [],
    "source": [
     "scenario_string = '394'\n",
-    "targets_info_location ='Eastern Scenario Take 2.csv'"
+    "targets_info_location = os.path.join('data', 'eastern_2030_clean_energy_targets.csv')"
    ]
   },
   {
@@ -1457,25 +1458,22 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "8784\n",
       "\n",
       "Alabama\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1483,6 +1481,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1492,19 +1492,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1512,6 +1510,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1519,11 +1519,10 @@
       "\n",
       "Connecticut\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1531,13 +1530,11 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource ng!\n",
-      "\n",
-      "Added resource wind!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource dfo!\n",
+      "Added resource ng!\n",
       "\n"
      ]
     },
@@ -1545,7 +1542,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "C:\\Users\\dmuldrew\\AppData\\Local\\Continuum\\anaconda3\\envs\\powersimdata\\lib\\site-packages\\powersimdata\\scenario\\scenario_info.py:175: UserWarning: No such type of generator in the area specified!\n",
+      "/Users/brdo/REM/PowerSimData/powersimdata/design/scenario_info.py:175: UserWarning: No such type of generator in the area specified!\n",
       "  warnings.warn('No such type of generator in the area specified!')\n"
      ]
     },
@@ -1553,13 +1550,16 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "No existing resource geothermal!\n",
+      "Added resource hydro!\n",
+      "\n",
       "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
+      "Invalid resource type\n",
+      "Added resource dfo!\n",
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1567,31 +1567,31 @@
       "\n",
       "Delaware\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "No existing resource hydro!\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "No existing resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1601,19 +1601,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1621,6 +1619,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1630,19 +1630,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1650,6 +1648,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1659,19 +1659,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1679,6 +1677,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1688,19 +1688,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1708,6 +1706,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1715,11 +1715,10 @@
       "\n",
       "Indiana\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "No existing resource nuclear!\n",
       "Invalid resource type\n",
@@ -1728,21 +1727,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1752,19 +1752,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1772,6 +1770,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1783,19 +1783,19 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
+      "Added resource solar!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
-      "Added resource solar!\n",
+      "Added resource wind!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1806,19 +1806,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1826,6 +1824,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1833,11 +1833,10 @@
       "\n",
       "Massachusetts\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1845,21 +1844,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1867,11 +1867,10 @@
       "\n",
       "Maryland\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1879,21 +1878,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1901,29 +1901,29 @@
       "\n",
       "Maine\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "No existing resource coal!\n",
       "Invalid resource type\n",
       "No such type of generator in the area specified. Division by zero.\n",
@@ -1932,11 +1932,10 @@
       "\n",
       "Michigan\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1944,21 +1943,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1968,19 +1968,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -1988,6 +1986,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -1997,19 +1997,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2017,6 +2015,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2028,21 +2028,21 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
+      "Added resource solar!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
-      "Added resource solar!\n",
+      "Added resource wind!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2055,12 +2055,6 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
-      "\n",
-      "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
       "No existing resource hydro!\n",
       "float division by zero\n",
       "No such type of generator in the area specified. Division by zero.\n",
@@ -2070,44 +2064,50 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Added resource wind!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource coal!\n",
       "\n",
       "\n",
       "North Carolina\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
+      "Added resource nuclear!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n"
+      "Added resource other!\n",
+      "\n"
      ]
     },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "\n",
-      "Added resource hydro!\n",
-      "\n",
-      "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource nuclear!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2115,29 +2115,29 @@
       "\n",
       "North Dakota\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2147,19 +2147,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2167,6 +2165,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2174,11 +2174,10 @@
       "\n",
       "New Hampshire\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2186,21 +2185,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2208,11 +2208,10 @@
       "\n",
       "New Jersey\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2220,21 +2219,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2246,32 +2246,30 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource solar!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource solar!\n",
+      "Added resource wind!\n",
       "\n",
       "\n",
       "New York\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2279,6 +2277,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2286,11 +2286,10 @@
       "\n",
       "Ohio\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2298,21 +2297,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2320,29 +2320,29 @@
       "\n",
       "Oklahoma\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2350,11 +2350,10 @@
       "\n",
       "Pennsylvania\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2362,21 +2361,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2384,37 +2384,36 @@
       "\n",
       "Rhode Island\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "\n",
       "South Carolina\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2422,21 +2421,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2444,29 +2444,29 @@
       "\n",
       "South Dakota\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2476,19 +2476,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2496,6 +2494,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2507,15 +2507,15 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
+      "\n",
+      "Added resource solar!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
-      "Added resource solar!\n",
+      "Added resource wind!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2524,11 +2524,10 @@
       "\n",
       "Virginia\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2536,21 +2535,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2558,61 +2558,55 @@
       "\n",
       "Vermont\n",
       "\n",
-      "Added resource wind!\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
+      "Added resource solar!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
+      "Added resource wind!\n",
+      "\n",
+      "\n",
+      "Wisconsin\n",
       "\n",
       "No existing resource geothermal!\n",
       "Invalid resource type\n",
       "No such type of generator in the area specified. Division by zero.\n",
       "Added resource geothermal!\n",
       "\n",
-      "Added resource solar!\n",
-      "\n",
-      "\n",
-      "Wisconsin\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2624,19 +2618,25 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
+      "Added resource solar!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
-      "\n",
-      "Added resource solar!\n",
+      "\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Added resource wind!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2663,25 +2663,22 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "8784\n",
       "\n",
       "Alabama\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2689,6 +2686,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2698,19 +2697,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2718,6 +2715,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2725,11 +2724,10 @@
       "\n",
       "Connecticut\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2737,21 +2735,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2759,31 +2758,31 @@
       "\n",
       "Delaware\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "No existing resource hydro!\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "No existing resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2793,19 +2792,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2813,6 +2810,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2822,19 +2821,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2842,6 +2839,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2851,19 +2850,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2871,6 +2868,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2880,19 +2879,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2900,6 +2897,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2907,11 +2906,10 @@
       "\n",
       "Indiana\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "No existing resource nuclear!\n",
       "Invalid resource type\n",
@@ -2920,21 +2918,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2944,19 +2943,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2964,6 +2961,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -2975,19 +2974,19 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
+      "Added resource solar!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
-      "Added resource solar!\n",
+      "Added resource wind!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -2998,19 +2997,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3018,6 +3015,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3025,11 +3024,10 @@
       "\n",
       "Massachusetts\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3037,21 +3035,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3059,11 +3058,10 @@
       "\n",
       "Maryland\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3071,21 +3069,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3093,29 +3092,29 @@
       "\n",
       "Maine\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "No existing resource coal!\n",
       "Invalid resource type\n",
       "No such type of generator in the area specified. Division by zero.\n",
@@ -3124,11 +3123,10 @@
       "\n",
       "Michigan\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3136,21 +3134,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3160,19 +3159,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3180,6 +3177,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3189,9 +3188,11 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
+      "Added resource nuclear!\n",
       "\n",
-      "Added resource hydro!\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n"
      ]
@@ -3200,14 +3201,10 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Invalid resource type\n",
-      "Added resource nuclear!\n",
-      "\n",
-      "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3215,6 +3212,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3226,21 +3225,21 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
+      "Added resource solar!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
-      "Added resource solar!\n",
+      "Added resource wind!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3253,12 +3252,6 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
-      "\n",
-      "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
       "No existing resource hydro!\n",
       "float division by zero\n",
       "No such type of generator in the area specified. Division by zero.\n",
@@ -3268,16 +3261,21 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Added resource wind!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource coal!\n",
       "\n",
       "\n",
       "North Carolina\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3285,21 +3283,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3307,29 +3306,29 @@
       "\n",
       "North Dakota\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3339,19 +3338,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3359,6 +3356,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3366,11 +3365,10 @@
       "\n",
       "New Hampshire\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3378,21 +3376,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3400,11 +3399,10 @@
       "\n",
       "New Jersey\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3412,21 +3410,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3438,22 +3437,16 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource solar!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource solar!\n",
-      "\n",
-      "\n",
-      "New York\n",
+      "Added resource wind!\n",
       "\n",
-      "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
+      "New York\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3461,9 +3454,13 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3471,6 +3468,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3478,11 +3477,10 @@
       "\n",
       "Ohio\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3490,21 +3488,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3512,29 +3511,29 @@
       "\n",
       "Oklahoma\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3542,11 +3541,10 @@
       "\n",
       "Pennsylvania\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3554,21 +3552,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3576,37 +3575,36 @@
       "\n",
       "Rhode Island\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "\n",
       "South Carolina\n",
       "\n",
+      "No existing resource geothermal!\n",
       "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3614,21 +3612,22 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
+      "Added resource other!\n",
+      "\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3636,29 +3635,29 @@
       "\n",
       "South Dakota\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3668,19 +3667,17 @@
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3688,6 +3685,8 @@
       "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3699,15 +3698,15 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
+      "\n",
+      "Added resource solar!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
-      "Added resource solar!\n",
+      "Added resource wind!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -3716,39 +3715,39 @@
       "\n",
       "Virginia\n",
       "\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
+      "Added resource nuclear!\n",
       "\n",
-      "Added resource hydro!\n",
+      "Invalid resource type\n",
+      "Invalid resource type\n",
+      "Added resource other!\n",
       "\n",
-      "Invalid resource type\n"
+      "Invalid resource type\n",
+      "Invalid resource type\n",
+      "Added resource ng!\n",
+      "\n"
      ]
     },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Invalid resource type\n",
-      "Added resource nuclear!\n",
-      "\n",
-      "Invalid resource type\n",
-      "Invalid resource type\n",
-      "Added resource ng!\n",
-      "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3756,55 +3755,55 @@
       "\n",
       "Vermont\n",
       "\n",
-      "Added resource wind!\n",
+      "No existing resource geothermal!\n",
+      "Invalid resource type\n",
+      "No such type of generator in the area specified. Division by zero.\n",
+      "Added resource geothermal!\n",
+      "\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
+      "Added resource solar!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
+      "Added resource wind!\n",
+      "\n",
+      "\n",
+      "Wisconsin\n",
       "\n",
       "No existing resource geothermal!\n",
       "Invalid resource type\n",
       "No such type of generator in the area specified. Division by zero.\n",
       "Added resource geothermal!\n",
       "\n",
-      "Added resource solar!\n",
-      "\n",
-      "\n",
-      "Wisconsin\n",
-      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource other!\n",
-      "\n",
-      "Added resource hydro!\n",
+      "Added resource nuclear!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
-      "Added resource nuclear!\n",
+      "Added resource other!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
-      "No existing resource geothermal!\n",
-      "Invalid resource type\n",
-      "No such type of generator in the area specified. Division by zero.\n",
-      "Added resource geothermal!\n",
-      "\n",
       "Added resource solar!\n",
       "\n",
+      "Added resource wind!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource coal!\n",
@@ -3816,19 +3815,19 @@
       "Invalid resource type\n",
       "Added resource ng!\n",
       "\n",
-      "Added resource wind!\n",
+      "Added resource hydro!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource dfo!\n",
       "\n",
+      "Added resource solar!\n",
+      "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
       "Added resource other!\n",
       "\n",
-      "Added resource hydro!\n",
-      "\n",
-      "Added resource solar!\n",
+      "Added resource wind!\n",
       "\n",
       "Invalid resource type\n",
       "Invalid resource type\n",
@@ -4757,15 +4756,6 @@
     "independent_next_capacities"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 13,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#independent_next_capacities.to_excel(\"Eastern_Independent.xlsx\")"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -4775,7 +4765,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [
     {
@@ -4831,12 +4821,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>1.686780e+05</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>75.000</td>\n",
        "      <td>1.000</td>\n",
-       "      <td>249.991082</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>214.176239</td>\n",
+       "      <td>2.855683</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Arkansas</th>\n",
@@ -4844,12 +4834,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>3.088913e+04</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>13.000</td>\n",
        "      <td>1.000</td>\n",
-       "      <td>43.331788</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>37.123881</td>\n",
+       "      <td>2.855683</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Connecticut</th>\n",
@@ -4857,12 +4847,12 @@
        "      <td>1.369935e+07</td>\n",
        "      <td>5.444679e+05</td>\n",
        "      <td>1.315488e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>25.200</td>\n",
        "      <td>5.000</td>\n",
-       "      <td>83.997004</td>\n",
-       "      <td>16.666072</td>\n",
+       "      <td>71.963216</td>\n",
+       "      <td>14.278416</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Delaware</th>\n",
@@ -4870,12 +4860,12 @@
        "      <td>3.607736e+06</td>\n",
        "      <td>6.465725e+04</td>\n",
        "      <td>3.543078e+06</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>30.799</td>\n",
        "      <td>2.000</td>\n",
-       "      <td>102.659671</td>\n",
-       "      <td>6.666429</td>\n",
+       "      <td>87.952187</td>\n",
+       "      <td>5.711366</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Florida</th>\n",
@@ -4883,12 +4873,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>6.376034e+05</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>331.599</td>\n",
        "      <td>3.000</td>\n",
-       "      <td>1105.290571</td>\n",
-       "      <td>9.999643</td>\n",
+       "      <td>946.941689</td>\n",
+       "      <td>8.567050</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Georgia</th>\n",
@@ -4896,12 +4886,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>1.872815e+06</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>978.100</td>\n",
        "      <td>2.000</td>\n",
-       "      <td>3260.217031</td>\n",
-       "      <td>6.666429</td>\n",
+       "      <td>2793.143726</td>\n",
+       "      <td>5.711366</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Iowa</th>\n",
@@ -4909,12 +4899,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>2.284169e+07</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>2.600</td>\n",
        "      <td>6935.303</td>\n",
-       "      <td>8.666358</td>\n",
-       "      <td>23116.852018</td>\n",
+       "      <td>7.424776</td>\n",
+       "      <td>19805.028180</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Illinois</th>\n",
@@ -4922,12 +4912,12 @@
        "      <td>4.412802e+07</td>\n",
        "      <td>1.276847e+07</td>\n",
        "      <td>3.135955e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>34.100</td>\n",
        "      <td>4008.500</td>\n",
-       "      <td>113.662612</td>\n",
-       "      <td>13361.190032</td>\n",
+       "      <td>97.378797</td>\n",
+       "      <td>11447.006059</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Indiana</th>\n",
@@ -4935,12 +4925,12 @@
        "      <td>1.134574e+07</td>\n",
        "      <td>6.363548e+06</td>\n",
        "      <td>4.982189e+06</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>160.597</td>\n",
        "      <td>1889.701</td>\n",
-       "      <td>535.304237</td>\n",
-       "      <td>6298.778637</td>\n",
+       "      <td>458.614153</td>\n",
+       "      <td>5396.387376</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Kansas</th>\n",
@@ -4948,12 +4938,12 @@
        "      <td>1.117864e+07</td>\n",
        "      <td>1.547162e+07</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>1.000</td>\n",
        "      <td>4469.801</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>14898.805181</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>12764.335569</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Kentucky</th>\n",
@@ -4961,12 +4951,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>2.114564e+04</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>10.000</td>\n",
        "      <td>1.000</td>\n",
-       "      <td>33.332144</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>28.556832</td>\n",
+       "      <td>2.855683</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Louisiana</th>\n",
@@ -4974,12 +4964,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>5.445332e+03</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>1.000</td>\n",
        "      <td>1.000</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Massachusetts</th>\n",
@@ -4987,12 +4977,12 @@
        "      <td>1.961179e+07</td>\n",
        "      <td>3.961751e+06</td>\n",
        "      <td>1.565004e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>482.297</td>\n",
        "      <td>96.400</td>\n",
-       "      <td>1607.599319</td>\n",
-       "      <td>321.321871</td>\n",
+       "      <td>1377.287434</td>\n",
+       "      <td>275.287859</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Maryland</th>\n",
@@ -5000,12 +4990,12 @@
        "      <td>4.268290e+07</td>\n",
        "      <td>2.981008e+06</td>\n",
        "      <td>3.970189e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>144.400</td>\n",
        "      <td>190.000</td>\n",
-       "      <td>481.316163</td>\n",
-       "      <td>633.310741</td>\n",
+       "      <td>412.360652</td>\n",
+       "      <td>542.579806</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Maine</th>\n",
@@ -5013,12 +5003,12 @@
        "      <td>7.939602e+06</td>\n",
        "      <td>5.146707e+06</td>\n",
        "      <td>2.792895e+06</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>1.000</td>\n",
        "      <td>898.800</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>2995.893127</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2566.688049</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Michigan</th>\n",
@@ -5026,12 +5016,12 @@
        "      <td>4.128669e+07</td>\n",
        "      <td>9.868740e+06</td>\n",
        "      <td>3.141795e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>12.500</td>\n",
        "      <td>1609.901</td>\n",
-       "      <td>41.665180</td>\n",
-       "      <td>5366.145240</td>\n",
+       "      <td>35.696040</td>\n",
+       "      <td>4597.367220</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Minnesota</th>\n",
@@ -5039,12 +5029,12 @@
        "      <td>1.858635e+07</td>\n",
        "      <td>1.239467e+07</td>\n",
        "      <td>6.191684e+06</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>256.200</td>\n",
        "      <td>3517.022</td>\n",
-       "      <td>853.969536</td>\n",
-       "      <td>11722.988472</td>\n",
+       "      <td>731.626033</td>\n",
+       "      <td>10043.500597</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Missouri</th>\n",
@@ -5052,12 +5042,12 @@
        "      <td>1.473278e+07</td>\n",
        "      <td>4.093900e+06</td>\n",
        "      <td>1.063888e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>26.700</td>\n",
        "      <td>660.400</td>\n",
-       "      <td>88.996825</td>\n",
-       "      <td>2201.254808</td>\n",
+       "      <td>76.246741</td>\n",
+       "      <td>1885.893177</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Mississippi</th>\n",
@@ -5065,12 +5055,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>9.494913e+03</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>3.100</td>\n",
        "      <td>1.000</td>\n",
-       "      <td>10.332965</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>8.852618</td>\n",
+       "      <td>2.855683</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Montana Eastern</th>\n",
@@ -5078,12 +5068,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>1.029446e+05</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>1.000</td>\n",
        "      <td>30.000</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>99.996433</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>85.670496</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>North Carolina</th>\n",
@@ -5091,12 +5081,12 @@
        "      <td>2.082713e+07</td>\n",
        "      <td>1.068939e+07</td>\n",
        "      <td>1.013774e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>2431.416</td>\n",
        "      <td>209.000</td>\n",
-       "      <td>8104.430890</td>\n",
-       "      <td>696.641815</td>\n",
+       "      <td>6943.353794</td>\n",
+       "      <td>596.837786</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>North Dakota</th>\n",
@@ -5104,12 +5094,12 @@
        "      <td>2.399374e+06</td>\n",
        "      <td>1.112050e+07</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>1.000</td>\n",
        "      <td>2828.402</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>9427.670353</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>8077.020040</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Nebraska</th>\n",
@@ -5117,12 +5107,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>4.619616e+06</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>6.300</td>\n",
        "      <td>1318.899</td>\n",
-       "      <td>20.999251</td>\n",
-       "      <td>4396.173175</td>\n",
+       "      <td>17.990804</td>\n",
+       "      <td>3766.357701</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>New Hampshire</th>\n",
@@ -5130,12 +5120,12 @@
        "      <td>2.661895e+06</td>\n",
        "      <td>5.193983e+05</td>\n",
        "      <td>2.142497e+06</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>1.000</td>\n",
        "      <td>185.300</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>617.644633</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>529.158095</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>New Jersey</th>\n",
@@ -5143,12 +5133,12 @@
        "      <td>5.707188e+07</td>\n",
        "      <td>1.690058e+06</td>\n",
        "      <td>5.538182e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>613.906</td>\n",
        "      <td>9.000</td>\n",
-       "      <td>2046.280336</td>\n",
-       "      <td>29.998930</td>\n",
+       "      <td>1753.121043</td>\n",
+       "      <td>25.701149</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>New Mexico Eastern</th>\n",
@@ -5156,12 +5146,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>2.023704e+06</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>165.000</td>\n",
        "      <td>483.601</td>\n",
-       "      <td>549.980381</td>\n",
-       "      <td>1611.945830</td>\n",
+       "      <td>471.187726</td>\n",
+       "      <td>1381.011245</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>New York</th>\n",
@@ -5169,12 +5159,12 @@
        "      <td>1.135637e+08</td>\n",
        "      <td>3.367330e+07</td>\n",
        "      <td>7.989044e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>110.300</td>\n",
        "      <td>1829.801</td>\n",
-       "      <td>367.653551</td>\n",
-       "      <td>6099.119093</td>\n",
+       "      <td>314.981856</td>\n",
+       "      <td>5225.331953</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Ohio</th>\n",
@@ -5182,12 +5172,12 @@
        "      <td>1.314764e+07</td>\n",
        "      <td>2.446017e+06</td>\n",
        "      <td>1.070162e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>48.800</td>\n",
        "      <td>533.902</td>\n",
-       "      <td>162.660864</td>\n",
-       "      <td>1779.609849</td>\n",
+       "      <td>139.357340</td>\n",
+       "      <td>1524.654965</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Oklahoma</th>\n",
@@ -5195,12 +5185,12 @@
        "      <td>1.208196e+07</td>\n",
        "      <td>2.569219e+07</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>2.500</td>\n",
        "      <td>6654.801</td>\n",
-       "      <td>8.333036</td>\n",
-       "      <td>22181.878705</td>\n",
+       "      <td>7.139208</td>\n",
+       "      <td>19004.003334</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Pennsylvania</th>\n",
@@ -5208,12 +5198,12 @@
        "      <td>2.773875e+07</td>\n",
        "      <td>9.854241e+06</td>\n",
        "      <td>1.788451e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>53.698</td>\n",
        "      <td>1373.400</td>\n",
-       "      <td>178.986948</td>\n",
-       "      <td>4577.836695</td>\n",
+       "      <td>153.344476</td>\n",
+       "      <td>3921.995290</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Rhode Island</th>\n",
@@ -5221,12 +5211,12 @@
        "      <td>2.085429e+06</td>\n",
        "      <td>2.055025e+05</td>\n",
        "      <td>1.879927e+06</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>10.201</td>\n",
        "      <td>51.000</td>\n",
-       "      <td>34.002120</td>\n",
-       "      <td>169.993936</td>\n",
+       "      <td>29.130824</td>\n",
+       "      <td>145.639843</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>South Carolina</th>\n",
@@ -5234,12 +5224,12 @@
        "      <td>1.908121e+06</td>\n",
        "      <td>5.478181e+06</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>19.300</td>\n",
        "      <td>1.000</td>\n",
-       "      <td>64.331038</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>55.114686</td>\n",
+       "      <td>2.855683</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>South Dakota</th>\n",
@@ -5247,12 +5237,12 @@
        "      <td>2.244648e+06</td>\n",
        "      <td>6.526782e+06</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>1.000</td>\n",
        "      <td>627.800</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>2092.592018</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>1792.797905</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Tennessee</th>\n",
@@ -5260,12 +5250,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>2.213095e+05</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>72.600</td>\n",
        "      <td>28.800</td>\n",
-       "      <td>241.991367</td>\n",
-       "      <td>95.996576</td>\n",
+       "      <td>207.322599</td>\n",
+       "      <td>82.243676</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Texas</th>\n",
@@ -5273,12 +5263,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>4.212626e+06</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>2.000</td>\n",
        "      <td>1247.599</td>\n",
-       "      <td>6.666429</td>\n",
-       "      <td>4158.514986</td>\n",
+       "      <td>5.711366</td>\n",
+       "      <td>3562.747489</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Virginia</th>\n",
@@ -5286,12 +5276,12 @@
        "      <td>2.104425e+07</td>\n",
        "      <td>6.530895e+06</td>\n",
        "      <td>1.451336e+07</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>139.000</td>\n",
        "      <td>2.000</td>\n",
-       "      <td>463.316805</td>\n",
-       "      <td>6.666429</td>\n",
+       "      <td>396.939963</td>\n",
+       "      <td>5.711366</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Vermont</th>\n",
@@ -5299,12 +5289,12 @@
        "      <td>3.330435e+06</td>\n",
        "      <td>1.619402e+06</td>\n",
        "      <td>1.711033e+06</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>65.997</td>\n",
        "      <td>121.000</td>\n",
-       "      <td>219.982153</td>\n",
-       "      <td>403.318946</td>\n",
+       "      <td>188.466523</td>\n",
+       "      <td>345.537666</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>Wisconsin</th>\n",
@@ -5312,12 +5302,12 @@
        "      <td>8.720262e+06</td>\n",
        "      <td>4.816550e+06</td>\n",
        "      <td>3.903712e+06</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>3.100</td>\n",
        "      <td>637.500</td>\n",
-       "      <td>10.332965</td>\n",
-       "      <td>2124.924197</td>\n",
+       "      <td>8.852618</td>\n",
+       "      <td>1820.498032</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>West Virginia</th>\n",
@@ -5325,12 +5315,12 @@
        "      <td>0.000000e+00</td>\n",
        "      <td>1.940154e+06</td>\n",
        "      <td>0.000000e+00</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>3.333214</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>2.855683</td>\n",
        "      <td>1.000</td>\n",
        "      <td>686.300</td>\n",
-       "      <td>3.333214</td>\n",
-       "      <td>2287.585062</td>\n",
+       "      <td>2.855683</td>\n",
+       "      <td>1959.855372</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
@@ -5381,45 +5371,45 @@
        "\n",
        "                    clean_energy_shortfall  solar_scaling  wind_scaling  \\\n",
        "region_name                                                               \n",
-       "Alabama             0.000000e+00            3.333214       3.333214       \n",
-       "Arkansas            0.000000e+00            3.333214       3.333214       \n",
-       "Connecticut         1.315488e+07            3.333214       3.333214       \n",
-       "Delaware            3.543078e+06            3.333214       3.333214       \n",
-       "Florida             0.000000e+00            3.333214       3.333214       \n",
-       "Georgia             0.000000e+00            3.333214       3.333214       \n",
-       "Iowa                0.000000e+00            3.333214       3.333214       \n",
-       "Illinois            3.135955e+07            3.333214       3.333214       \n",
-       "Indiana             4.982189e+06            3.333214       3.333214       \n",
-       "Kansas              0.000000e+00            3.333214       3.333214       \n",
-       "Kentucky            0.000000e+00            3.333214       3.333214       \n",
-       "Louisiana           0.000000e+00            3.333214       3.333214       \n",
-       "Massachusetts       1.565004e+07            3.333214       3.333214       \n",
-       "Maryland            3.970189e+07            3.333214       3.333214       \n",
-       "Maine               2.792895e+06            3.333214       3.333214       \n",
-       "Michigan            3.141795e+07            3.333214       3.333214       \n",
-       "Minnesota           6.191684e+06            3.333214       3.333214       \n",
-       "Missouri            1.063888e+07            3.333214       3.333214       \n",
-       "Mississippi         0.000000e+00            3.333214       3.333214       \n",
-       "Montana Eastern     0.000000e+00            3.333214       3.333214       \n",
-       "North Carolina      1.013774e+07            3.333214       3.333214       \n",
-       "North Dakota        0.000000e+00            3.333214       3.333214       \n",
-       "Nebraska            0.000000e+00            3.333214       3.333214       \n",
-       "New Hampshire       2.142497e+06            3.333214       3.333214       \n",
-       "New Jersey          5.538182e+07            3.333214       3.333214       \n",
-       "New Mexico Eastern  0.000000e+00            3.333214       3.333214       \n",
-       "New York            7.989044e+07            3.333214       3.333214       \n",
-       "Ohio                1.070162e+07            3.333214       3.333214       \n",
-       "Oklahoma            0.000000e+00            3.333214       3.333214       \n",
-       "Pennsylvania        1.788451e+07            3.333214       3.333214       \n",
-       "Rhode Island        1.879927e+06            3.333214       3.333214       \n",
-       "South Carolina      0.000000e+00            3.333214       3.333214       \n",
-       "South Dakota        0.000000e+00            3.333214       3.333214       \n",
-       "Tennessee           0.000000e+00            3.333214       3.333214       \n",
-       "Texas               0.000000e+00            3.333214       3.333214       \n",
-       "Virginia            1.451336e+07            3.333214       3.333214       \n",
-       "Vermont             1.711033e+06            3.333214       3.333214       \n",
-       "Wisconsin           3.903712e+06            3.333214       3.333214       \n",
-       "West Virginia       0.000000e+00            3.333214       3.333214       \n",
+       "Alabama             0.000000e+00            2.855683       2.855683       \n",
+       "Arkansas            0.000000e+00            2.855683       2.855683       \n",
+       "Connecticut         1.315488e+07            2.855683       2.855683       \n",
+       "Delaware            3.543078e+06            2.855683       2.855683       \n",
+       "Florida             0.000000e+00            2.855683       2.855683       \n",
+       "Georgia             0.000000e+00            2.855683       2.855683       \n",
+       "Iowa                0.000000e+00            2.855683       2.855683       \n",
+       "Illinois            3.135955e+07            2.855683       2.855683       \n",
+       "Indiana             4.982189e+06            2.855683       2.855683       \n",
+       "Kansas              0.000000e+00            2.855683       2.855683       \n",
+       "Kentucky            0.000000e+00            2.855683       2.855683       \n",
+       "Louisiana           0.000000e+00            2.855683       2.855683       \n",
+       "Massachusetts       1.565004e+07            2.855683       2.855683       \n",
+       "Maryland            3.970189e+07            2.855683       2.855683       \n",
+       "Maine               2.792895e+06            2.855683       2.855683       \n",
+       "Michigan            3.141795e+07            2.855683       2.855683       \n",
+       "Minnesota           6.191684e+06            2.855683       2.855683       \n",
+       "Missouri            1.063888e+07            2.855683       2.855683       \n",
+       "Mississippi         0.000000e+00            2.855683       2.855683       \n",
+       "Montana Eastern     0.000000e+00            2.855683       2.855683       \n",
+       "North Carolina      1.013774e+07            2.855683       2.855683       \n",
+       "North Dakota        0.000000e+00            2.855683       2.855683       \n",
+       "Nebraska            0.000000e+00            2.855683       2.855683       \n",
+       "New Hampshire       2.142497e+06            2.855683       2.855683       \n",
+       "New Jersey          5.538182e+07            2.855683       2.855683       \n",
+       "New Mexico Eastern  0.000000e+00            2.855683       2.855683       \n",
+       "New York            7.989044e+07            2.855683       2.855683       \n",
+       "Ohio                1.070162e+07            2.855683       2.855683       \n",
+       "Oklahoma            0.000000e+00            2.855683       2.855683       \n",
+       "Pennsylvania        1.788451e+07            2.855683       2.855683       \n",
+       "Rhode Island        1.879927e+06            2.855683       2.855683       \n",
+       "South Carolina      0.000000e+00            2.855683       2.855683       \n",
+       "South Dakota        0.000000e+00            2.855683       2.855683       \n",
+       "Tennessee           0.000000e+00            2.855683       2.855683       \n",
+       "Texas               0.000000e+00            2.855683       2.855683       \n",
+       "Virginia            1.451336e+07            2.855683       2.855683       \n",
+       "Vermont             1.711033e+06            2.855683       2.855683       \n",
+       "Wisconsin           3.903712e+06            2.855683       2.855683       \n",
+       "West Virginia       0.000000e+00            2.855683       2.855683       \n",
        "\n",
        "                    solar_prev_capacity  wind_prev_capacity  \\\n",
        "region_name                                                   \n",
@@ -5465,48 +5455,48 @@
        "\n",
        "                    next_solar_capacity  next_wind_capacity  \n",
        "region_name                                                  \n",
-       "Alabama             249.991082           3.333214            \n",
-       "Arkansas            43.331788            3.333214            \n",
-       "Connecticut         83.997004            16.666072           \n",
-       "Delaware            102.659671           6.666429            \n",
-       "Florida             1105.290571          9.999643            \n",
-       "Georgia             3260.217031          6.666429            \n",
-       "Iowa                8.666358             23116.852018        \n",
-       "Illinois            113.662612           13361.190032        \n",
-       "Indiana             535.304237           6298.778637         \n",
-       "Kansas              3.333214             14898.805181        \n",
-       "Kentucky            33.332144            3.333214            \n",
-       "Louisiana           3.333214             3.333214            \n",
-       "Massachusetts       1607.599319          321.321871          \n",
-       "Maryland            481.316163           633.310741          \n",
-       "Maine               3.333214             2995.893127         \n",
-       "Michigan            41.665180            5366.145240         \n",
-       "Minnesota           853.969536           11722.988472        \n",
-       "Missouri            88.996825            2201.254808         \n",
-       "Mississippi         10.332965            3.333214            \n",
-       "Montana Eastern     3.333214             99.996433           \n",
-       "North Carolina      8104.430890          696.641815          \n",
-       "North Dakota        3.333214             9427.670353         \n",
-       "Nebraska            20.999251            4396.173175         \n",
-       "New Hampshire       3.333214             617.644633          \n",
-       "New Jersey          2046.280336          29.998930           \n",
-       "New Mexico Eastern  549.980381           1611.945830         \n",
-       "New York            367.653551           6099.119093         \n",
-       "Ohio                162.660864           1779.609849         \n",
-       "Oklahoma            8.333036             22181.878705        \n",
-       "Pennsylvania        178.986948           4577.836695         \n",
-       "Rhode Island        34.002120            169.993936          \n",
-       "South Carolina      64.331038            3.333214            \n",
-       "South Dakota        3.333214             2092.592018         \n",
-       "Tennessee           241.991367           95.996576           \n",
-       "Texas               6.666429             4158.514986         \n",
-       "Virginia            463.316805           6.666429            \n",
-       "Vermont             219.982153           403.318946          \n",
-       "Wisconsin           10.332965            2124.924197         \n",
-       "West Virginia       3.333214             2287.585062         "
+       "Alabama             214.176239           2.855683            \n",
+       "Arkansas            37.123881            2.855683            \n",
+       "Connecticut         71.963216            14.278416           \n",
+       "Delaware            87.952187            5.711366            \n",
+       "Florida             946.941689           8.567050            \n",
+       "Georgia             2793.143726          5.711366            \n",
+       "Iowa                7.424776             19805.028180        \n",
+       "Illinois            97.378797            11447.006059        \n",
+       "Indiana             458.614153           5396.387376         \n",
+       "Kansas              2.855683             12764.335569        \n",
+       "Kentucky            28.556832            2.855683            \n",
+       "Louisiana           2.855683             2.855683            \n",
+       "Massachusetts       1377.287434          275.287859          \n",
+       "Maryland            412.360652           542.579806          \n",
+       "Maine               2.855683             2566.688049         \n",
+       "Michigan            35.696040            4597.367220         \n",
+       "Minnesota           731.626033           10043.500597        \n",
+       "Missouri            76.246741            1885.893177         \n",
+       "Mississippi         8.852618             2.855683            \n",
+       "Montana Eastern     2.855683             85.670496           \n",
+       "North Carolina      6943.353794          596.837786          \n",
+       "North Dakota        2.855683             8077.020040         \n",
+       "Nebraska            17.990804            3766.357701         \n",
+       "New Hampshire       2.855683             529.158095          \n",
+       "New Jersey          1753.121043          25.701149           \n",
+       "New Mexico Eastern  471.187726           1381.011245         \n",
+       "New York            314.981856           5225.331953         \n",
+       "Ohio                139.357340           1524.654965         \n",
+       "Oklahoma            7.139208             19004.003334        \n",
+       "Pennsylvania        153.344476           3921.995290         \n",
+       "Rhode Island        29.130824            145.639843          \n",
+       "South Carolina      55.114686            2.855683            \n",
+       "South Dakota        2.855683             1792.797905         \n",
+       "Tennessee           207.322599           82.243676           \n",
+       "Texas               5.711366             3562.747489         \n",
+       "Virginia            396.939963           5.711366            \n",
+       "Vermont             188.466523           345.537666          \n",
+       "Wisconsin           8.852618             1820.498032         \n",
+       "West Virginia       2.855683             1959.855372         "
       ]
      },
-     "execution_count": 14,
+     "execution_count": 13,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -5516,15 +5506,6 @@
     "collaborative_next_capacities"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 15,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#collaborative_next_capacities.to_csv(\"Eastern_Collaborative.csv\")"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -5535,7 +5516,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
@@ -7224,7 +7205,7 @@
        "[39 rows x 79 columns]"
       ]
      },
-     "execution_count": 16,
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -7243,16 +7224,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#cap_planning_df.to_excel(\"Eastern_Capacity_Inputs.xlsx\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
@@ -7776,7 +7748,7 @@
        "West Virginia      NaN         1.000    "
       ]
      },
-     "execution_count": 18,
+     "execution_count": 15,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -7803,7 +7775,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
@@ -8080,7 +8052,7 @@
        "West Virginia       1.000000             686.300000        "
       ]
      },
-     "execution_count": 19,
+     "execution_count": 16,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -8092,7 +8064,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 17,
    "metadata": {
     "scrolled": true
    },
@@ -8742,7 +8714,7 @@
        "West Virginia       686.300000          "
       ]
      },
-     "execution_count": 20,
+     "execution_count": 17,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -8752,29 +8724,13 @@
     "merged_capacities = merged_capacities.fillna(0.0)\n",
     "merged_capacities"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 21,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#merged_capacities.to_excel(\"Next_Capacity_Outputs.xlsx\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python [conda env:powersimdata] *",
+   "display_name": "v1",
    "language": "python",
-   "name": "conda-env-powersimdata-py"
+   "name": "v1"
   },
   "language_info": {
    "codemirror_mode": {
diff --git a/powersimdata/scenario/scenario_info.py b/powersimdata/design/scenario_info.py
similarity index 100%
rename from powersimdata/scenario/scenario_info.py
rename to powersimdata/design/scenario_info.py
diff --git a/powersimdata/scaling/clean_capacity_scaling/save_files/__init__.py b/powersimdata/design/tests/__init__.py
similarity index 100%
rename from powersimdata/scaling/clean_capacity_scaling/save_files/__init__.py
rename to powersimdata/design/tests/__init__.py
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/test_object_persistence.py b/powersimdata/design/tests/test_object_persistence.py
similarity index 98%
rename from powersimdata/scaling/clean_capacity_scaling/tests/test_object_persistence.py
rename to powersimdata/design/tests/test_object_persistence.py
index 0e180ee07..665dbdcc7 100644
--- a/powersimdata/scaling/clean_capacity_scaling/tests/test_object_persistence.py
+++ b/powersimdata/design/tests/test_object_persistence.py
@@ -1,4 +1,4 @@
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling \
+from powersimdata.design.clean_capacity_scaling \
     import TargetManager, AbstractStrategyManager, Resource
 import jsonpickle
 import json
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/test_resource_target_manager.py b/powersimdata/design/tests/test_resource_target_manager.py
similarity index 98%
rename from powersimdata/scaling/clean_capacity_scaling/tests/test_resource_target_manager.py
rename to powersimdata/design/tests/test_resource_target_manager.py
index 2c6b54b1f..069c06e37 100644
--- a/powersimdata/scaling/clean_capacity_scaling/tests/test_resource_target_manager.py
+++ b/powersimdata/design/tests/test_resource_target_manager.py
@@ -1,4 +1,4 @@
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling\
+from powersimdata.design.clean_capacity_scaling\
     import Resource, TargetManager
 from pytest import approx
 from unittest.mock import patch
diff --git a/powersimdata/scenario/tests/test_scenario_info.py b/powersimdata/design/tests/test_scenario_info.py
similarity index 99%
rename from powersimdata/scenario/tests/test_scenario_info.py
rename to powersimdata/design/tests/test_scenario_info.py
index d3035843e..b3f301bcf 100644
--- a/powersimdata/scenario/tests/test_scenario_info.py
+++ b/powersimdata/design/tests/test_scenario_info.py
@@ -1,7 +1,7 @@
 import unittest
 import pandas as pd
 
-from powersimdata.scenario.scenario_info import ScenarioInfo
+from powersimdata.design.scenario_info import ScenarioInfo
 from postreise.tests.mock_scenario import MockScenario
 
 mock_plant = {
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/test_strategies.py b/powersimdata/design/tests/test_strategies.py
similarity index 99%
rename from powersimdata/scaling/clean_capacity_scaling/tests/test_strategies.py
rename to powersimdata/design/tests/test_strategies.py
index 310d6fff6..35f0c6247 100644
--- a/powersimdata/scaling/clean_capacity_scaling/tests/test_strategies.py
+++ b/powersimdata/design/tests/test_strategies.py
@@ -1,4 +1,4 @@
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling\
+from powersimdata.design.clean_capacity_scaling\
     import Resource, TargetManager, AbstractStrategyManager, \
     IndependentStrategyManager, CollaborativeStrategyManager
 from pytest import approx, raises
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/test_target_manager_input.py b/powersimdata/design/tests/test_target_manager_input.py
similarity index 96%
rename from powersimdata/scaling/clean_capacity_scaling/tests/test_target_manager_input.py
rename to powersimdata/design/tests/test_target_manager_input.py
index 5876a94c8..40b7387e1 100644
--- a/powersimdata/scaling/clean_capacity_scaling/tests/test_target_manager_input.py
+++ b/powersimdata/design/tests/test_target_manager_input.py
@@ -1,4 +1,4 @@
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling \
+from powersimdata.design.clean_capacity_scaling \
     import AbstractStrategyManager, TargetManager
 import pandas as pd
 
diff --git a/powersimdata/input/tests/test_design_transmission.py b/powersimdata/design/tests/test_transmission.py
similarity index 99%
rename from powersimdata/input/tests/test_design_transmission.py
rename to powersimdata/design/tests/test_transmission.py
index 33a653c4b..024484631 100644
--- a/powersimdata/input/tests/test_design_transmission.py
+++ b/powersimdata/design/tests/test_transmission.py
@@ -6,7 +6,7 @@
 from powersimdata.tests.mock_grid import MockGrid
 from postreise.tests.mock_scenario import MockScenario
 from powersimdata.tests.mock_change_table import MockChangeTable
-from powersimdata.input.design_transmission import (
+from powersimdata.design.transmission import (
     _find_branches_connected_to_bus, _find_first_degree_branches,
     _find_stub_degree, _find_capacity_at_bus, scale_renewable_stubs,
     _identify_mesh_branch_upgrades, _increment_branch_scaling)
diff --git a/powersimdata/input/design_transmission.py b/powersimdata/design/transmission.py
similarity index 100%
rename from powersimdata/input/design_transmission.py
rename to powersimdata/design/transmission.py
diff --git a/powersimdata/input/__init__.py b/powersimdata/input/__init__.py
index deea6c0ae..f89935d6a 100644
--- a/powersimdata/input/__init__.py
+++ b/powersimdata/input/__init__.py
@@ -1,3 +1,3 @@
-__all__ = ['abstract_grid', 'change_table', 'csv_reader', 'design_transmission',
+__all__ = ['abstract_grid', 'change_table', 'csv_reader', 
            'grid', 'helpers', 'mat_reader', 'profiles', 'scaler',
            'usa_tamu_model']
diff --git a/powersimdata/input/change_table.py b/powersimdata/input/change_table.py
index 94a5c4176..6d0f91995 100644
--- a/powersimdata/input/change_table.py
+++ b/powersimdata/input/change_table.py
@@ -1,7 +1,7 @@
 import os
 import pickle
 
-from powersimdata.input.design_transmission import (
+from powersimdata.design.transmission import (
     scale_congested_mesh_branches, scale_renewable_stubs)
 from powersimdata.input.grid import Grid
 from powersimdata.utility import const
@@ -296,7 +296,9 @@ def scale_demand(self, zone_name=None, zone_id=None):
 
     def scale_renewable_stubs(self, **kwargs):
         """Scales undersized stub branches connected to renewable generators.
-        Optional kwargs as documented in powersimdata.input.design_transmission
+        
+        Optional kwargs as documented in the
+            :mod:`powersimdata.design.transmission` module.
         """
         scale_renewable_stubs(self, **kwargs)
     
@@ -304,7 +306,9 @@ def scale_congested_mesh_branches(self, ref_scenario, **kwargs):
         """Scales congested branches based on previous scenario results.
         :param powersimdata.scenario.scenario.Scenario ref_scenario: the
             reference scenario to be used in determining branch scaling.
-        Optional kwargs as documented in powersimdata.input.design_transmission
+        
+        Optional kwargs as documented in the 
+            :mod:`powersimdata.design.transmission` module.
         """
         scale_congested_mesh_branches(self, ref_scenario, **kwargs)
 
diff --git a/powersimdata/scaling/__init__.py b/powersimdata/scaling/__init__.py
deleted file mode 100644
index 591a16aab..000000000
--- a/powersimdata/scaling/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__all__ = ['clean_capacity_scaling']
diff --git a/powersimdata/scaling/clean_capacity_scaling/__init__.py b/powersimdata/scaling/clean_capacity_scaling/__init__.py
deleted file mode 100644
index 5f64c3007..000000000
--- a/powersimdata/scaling/clean_capacity_scaling/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__all__ = ['tests', 'data', 'demo', 'save_files']
diff --git a/powersimdata/scaling/clean_capacity_scaling/data/Capacity_Scaling_Western_Test_Case.xlsx b/powersimdata/scaling/clean_capacity_scaling/data/Capacity_Scaling_Western_Test_Case.xlsx
deleted file mode 100644
index f77b1cc68..000000000
Binary files a/powersimdata/scaling/clean_capacity_scaling/data/Capacity_Scaling_Western_Test_Case.xlsx and /dev/null differ
diff --git a/powersimdata/scaling/clean_capacity_scaling/data/Clean_Capacity_Scaling_TestCase_Data.xlsx b/powersimdata/scaling/clean_capacity_scaling/data/Clean_Capacity_Scaling_TestCase_Data.xlsx
deleted file mode 100644
index 1206106bf..000000000
Binary files a/powersimdata/scaling/clean_capacity_scaling/data/Clean_Capacity_Scaling_TestCase_Data.xlsx and /dev/null differ
diff --git a/powersimdata/scaling/clean_capacity_scaling/data/Coding Requirements for RenGen Scenarios.docx b/powersimdata/scaling/clean_capacity_scaling/data/Coding Requirements for RenGen Scenarios.docx
deleted file mode 100644
index aea1e28c0..000000000
Binary files a/powersimdata/scaling/clean_capacity_scaling/data/Coding Requirements for RenGen Scenarios.docx and /dev/null differ
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/__init__.py b/powersimdata/scaling/clean_capacity_scaling/tests/__init__.py
deleted file mode 100644
index b680692d5..000000000
--- a/powersimdata/scaling/clean_capacity_scaling/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__all__ = []
\ No newline at end of file
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/test_bulk_input.xlsx b/powersimdata/scaling/clean_capacity_scaling/tests/test_bulk_input.xlsx
deleted file mode 100644
index b7674f014..000000000
Binary files a/powersimdata/scaling/clean_capacity_scaling/tests/test_bulk_input.xlsx and /dev/null differ
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/test_case_input_output.csv b/powersimdata/scaling/clean_capacity_scaling/tests/test_case_input_output.csv
deleted file mode 100644
index 3b1c61b89..000000000
--- a/powersimdata/scaling/clean_capacity_scaling/tests/test_case_input_output.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-region_name,ce_target_fraction,CE_Type,allowed_resources,geothermal_generation,hydro_generation,nuclear_generation,solar_generation,wind_generation,Externally Calculated CE_Total Gen (if any),Previous Case's CE-eligible Gen,geothermal_capacity,hydro_capacity,nuclear_capacity,solar_capacity,wind_capacity,no_cong_solar_cf,no_cong_wind_cf,prev_sim_solar_cf,prev_sim_wind_cf,prev_solar_curtailment,prev_wind_curtailment,total_demand,strategy,solar_percentage,solar_addl_curtailment,wind_addl_curtailment,ce_target,ce_shortfall,ce_overgeneration,solar_expected_capacity_factor,wind_expected_capacity_factor,solar_added_capacity,wind_added_capacity,next_case_solar_capacity,next_case_wind_capacity,,,
-Pacific1,0.25,Renewables,"Geothermal, Solar, Wind",8000,7000,6000,8125.2,12648.96,,28774.16,4000,3900,3800,3700,3600,0.25,0.4,0.25,0.4,0,0,200000,Independently,0.75,0.4,0,50000,21225.84,0,0.15,0.4,8528.543877,2842.847959,12228.54388,6442.847959,,,
-Atlantic1,0.3,Renewables,"Geothermal, Hydro, Solar, Wind",8500,7500,6500,11067.84,12605.04,,39672.88,4500,4400,4300,4200,4100,0.3,0.35,0.3,0.35,0,0,300000,Independently,0.506024096,0,0,90000,50327.12,0,0.3,0.35,8928.947555,8716.353566,13128.94756,12816.35357,,,
-Pacific2,0.25,Renewables,"Geothermal, Solar, Wind",8000,7000,6000,7000,11000,,26000,4000,3900,3800,3700,3600,0.25,0.4,0.215379314,0.347854685,0.138482745,0.130363287,200000,Independently,0.506849315,0,0,50000,24000,0,0.215379314,0.347854685,4933.333333,4800,8633.333333,8400,,,
-Atlantic2,0.4,Clean,"Geothermal, Hydro, Nuclear, Solar, Wind",8500,7500,6500,10500,11500,,44500,4500,4400,4300,4200,4100,0.3,0.35,0.284608379,0.319316718,0.051305404,0.087666521,300000,Independently,0.506024096,0,0,120000,75500,0,0.284608379,0.319316718,14413.63636,14070.45455,18613.63636,18170.45455,,,
-Pacific3,0.25,Renewables,"Geothermal, Solar, Wind",8000,7000,6000,7000,11000,,26000,4000,3900,3800,3700,3600,0.25,0.4,0.215379314,0.347854685,0.138482745,0.130363287,200000,Independently,1,0,0,50000,24000,0,0.215379314,0.347854685,12685.71429,0,16385.71429,3600,,,
-Atlantic3,0.4,Clean,"Geothermal, Hydro, Nuclear, Solar, Wind",8500,7500,6500,10500,11500,,44500,4500,4400,4300,4200,4100,0.3,0.35,0.284608379,0.319316718,0.051305404,0.087666521,300000,Independently,0.506024096,0,0,120000,75500,0,0.284608379,0.319316718,14413.63636,14070.45455,18613.63636,18170.45455,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/test_case_input_output.xlsx b/powersimdata/scaling/clean_capacity_scaling/tests/test_case_input_output.xlsx
deleted file mode 100644
index 5caca45b3..000000000
Binary files a/powersimdata/scaling/clean_capacity_scaling/tests/test_case_input_output.xlsx and /dev/null differ