diff --git a/.idea/PyDSS-heco.iml b/.idea/PyDSS-heco.iml
index 2fb94a55..6b67bb50 100644
--- a/.idea/PyDSS-heco.iml
+++ b/.idea/PyDSS-heco.iml
@@ -2,7 +2,11 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
+<<<<<<< HEAD
     <orderEntry type="jdk" jdkName="Python 3.7 (PyDSS)" jdkType="Python SDK" />
+=======
+    <orderEntry type="jdk" jdkName="Python 3.7 (DG2)" jdkType="Python SDK" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="ReSTService">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index dc22b812..21cb0c66 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+<<<<<<< HEAD
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (PyDSS)" project-jdk-type="Python SDK" />
+=======
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (DG2)" project-jdk-type="Python SDK" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b22df48d..31d9ab1b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,6 +5,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/PyDSS-heco.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/PyDSS-heco.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/LICENSE" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/PyDSS.egg-info/PKG-INFO" beforeDir="false" afterPath="$PROJECT_DIR$/PyDSS.egg-info/PKG-INFO" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/PyDSS.egg-info/SOURCES.txt" beforeDir="false" afterPath="$PROJECT_DIR$/PyDSS.egg-info/SOURCES.txt" afterDir="false" />
@@ -75,6 +76,10 @@
       <change beforePath="$PROJECT_DIR$/build/lib/pyControllers/xfmrController.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/dist/PyDSS-0.0.1-py3.6.egg" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
+=======
+      <change beforePath="$PROJECT_DIR$/PyDSS/dssElement.py" beforeDir="false" afterPath="$PROJECT_DIR$/PyDSS/dssElement.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/PyDSS/dssInstance.py" beforeDir="false" afterPath="$PROJECT_DIR$/PyDSS/dssInstance.py" afterDir="false" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
     </list>
     <list id="4d158a37-460e-4f32-90b0-7874bee38a84" name="Default" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -88,6 +93,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/PyDSS/pyDSS.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -95,35 +101,72 @@
               <caret line="197" column="47" selection-start-line="197" selection-start-column="47" selection-end-line="197" selection-end-column="47" />
               <folding>
                 <element signature="e#0#61#0" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/PyDSS/pyControllers/pyController.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/PyDSS/dssInstance.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="518">
+              <caret line="357" selection-start-line="357" selection-end-line="358" />
+              <folding>
+                <element signature="e#0#55#0" expanded="true" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/PyDSS/dssInstance.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="188">
               <caret line="327" column="11" selection-start-line="327" selection-start-column="11" selection-end-line="327" selection-end-column="11" />
               <folding>
                 <element signature="e#0#55#0" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/PyDSS.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="306">
+              <caret line="141" column="30" lean-forward="true" selection-start-line="141" selection-start-column="30" selection-end-line="141" selection-end-column="30" />
+              <folding>
+                <element signature="e#0#61#0" expanded="true" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/PyDSS/SolveMode.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="761">
               <caret line="76" column="14" selection-start-line="76" selection-start-column="14" selection-end-line="76" selection-end-column="14" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/PyDSS/ResultContainer.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="357">
+              <caret line="21" column="25" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="25" />
+              <folding>
+                <element signature="e#0#60#0" expanded="true" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/PyDSS/ResultContainer.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -131,12 +174,22 @@
               <caret line="275" column="17" selection-start-line="275" selection-start-column="17" selection-end-line="275" selection-end-column="17" />
               <folding>
                 <element signature="e#0#60#0" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/PyDSS/dssElement.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="773">
+              <caret line="131" column="9" lean-forward="true" selection-start-line="131" selection-start-column="9" selection-end-line="131" selection-end-column="9" />
+              <folding>
+                <element signature="e#0#31#0" expanded="true" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/PyDSS/Extensions/MonteCarlo.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="85">
@@ -161,12 +214,21 @@
               <caret line="86" selection-start-line="86" selection-end-line="86" />
               <folding>
                 <element signature="e#0#54#0" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/../Helics Example/pireciever.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="51">
+              <caret line="4" column="30" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="30" />
+              <folding>
+                <element signature="e#24#42#0" expanded="true" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/test.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="68">
@@ -180,15 +242,31 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="340">
               <caret line="20" column="27" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="27" />
+=======
+        <entry file="file://$PROJECT_DIR$/../Helics Example/pisender.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="663">
+              <caret line="41" column="4" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
+              <folding>
+                <element signature="e#24#35#0" expanded="true" />
+              </folding>
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/PyDSS/pyPlots/pyPlots.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="306">
               <caret line="21" selection-start-line="21" selection-end-line="21" />
+=======
+        <entry file="file://$PROJECT_DIR$/../Helics Example/Broker2.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="51">
+              <caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
             </state>
           </provider>
         </entry>
@@ -205,6 +283,16 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
+=======
+      <find>__dssElement</find>
+      <find>Step resolution (min)</find>
+      <find>modifi</find>
+      <find>modifier</find>
+      <find>runmc</find>
+      <find>cork</find>
+      <find>Separate</find>
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <find>no con</find>
       <find>ast</find>
       <find>GetParameter2</find>
@@ -225,6 +313,7 @@
       <find>exists</find>
       <find>Async.</find>
       <find>Async</find>
+<<<<<<< HEAD
       <find>self.__BaseKV</find>
       <find>pyControllers</find>
       <find>ResultObject</find>
@@ -235,6 +324,11 @@
       <find>in the master TOML file</find>
       <find>Simulation mode</find>
       <find>print</find>
+=======
+      <find>print</find>
+      <find>self.__BaseKV</find>
+      <find>pyControllers</find>
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
     </findStrings>
     <replaceStrings>
       <replace />
@@ -252,6 +346,7 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/PyDSS/PyDSS.py" />
         <option value="$PROJECT_DIR$/setup.py" />
         <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssProfilePlot.py" />
@@ -278,14 +373,74 @@
         <option value="$PROJECT_DIR$/PyDSS/ResultContainer.py" />
         <option value="$PROJECT_DIR$/PyDSS/dssInstance.py" />
         <option value="$PROJECT_DIR$/PyDSS/pyDSS.py" />
+=======
+        <option value="$PROJECT_DIR$/build/lib/PyDSS/dssInstance.py" />
+        <option value="$PROJECT_DIR$/../PyDSS-Projects/PRECISE/Exports/CalculateCurtailment.py" />
+        <option value="$PROJECT_DIR$/../PyDSS-Projects/PRECISE/Exports/probability_dist.py" />
+        <option value="$PROJECT_DIR$/../PyDSS-Projects/SRP/Exports/Plot_exported_results.py" />
+        <option value="$PROJECT_DIR$/pydss_cmd.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyControllers/Controllers/PvController2.py" />
+        <option value="$PROJECT_DIR$/../PyDSS-Projects/PV_with_voltage_ridethrough/PyDSS Scenarios/smartPV/pyControllerList/Ride through tester.py" />
+        <option value="$PROJECT_DIR$/PyDSS/dssCircuit.py" />
+        <option value="$PROJECT_DIR$/PyDSS/dssBus.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssResult.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyControllers/Controllers/FaultController.py" />
+        <option value="$PROJECT_DIR$/PyDSS/PyPlots/Plots/Histogram.py" />
+        <option value="$PROJECT_DIR$/PyDSS/PyPlots/Plots/SagPlot.py" />
+        <option value="$PROJECT_DIR$/PyDSS/PyPlots/Plots/TimeSeries.py" />
+        <option value="$PROJECT_DIR$/PyDSS/PyPlots/Plots/Topology.py" />
+        <option value="$PROJECT_DIR$/PyDSS/PyPlots/Plots/XYPlot.py" />
+        <option value="$PROJECT_DIR$/PyDSS/PyPlots/Plots/FrequencySweep.py" />
+        <option value="$PROJECT_DIR$/../SRP Dashborads/Polling codes/LG chem experimental run v3/modbus_poller.py" />
+        <option value="$PROJECT_DIR$/../Solar distric cup usecases/JBG_Smith_Usecase/profile creator.py" />
+        <option value="$PROJECT_DIR$/../Solar distric cup usecases/JBG_Smith_Usecase/PSLF_file_modifier.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyControllers/Controllers/PvController.py" />
+        <option value="$PROJECT_DIR$/PyDSS/PyPlots/Plots/GISplot.py" />
+        <option value="$PROJECT_DIR$/PyDSS/PyPlots/pyPlots.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyControllers/Controllers/StorageController.py" />
+        <option value="$PROJECT_DIR$/PyDSS/dssVisualizer.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssVisualizer.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssSimulationResult.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssComparitor.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssGISplot.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssFrequencySweep.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssXYplot.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssVoltageDistance.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssProfilePlot.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssPDFplot.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyAnalyzer/dssGraphicsGenerator.py" />
+        <option value="$PROJECT_DIR$/PyDSS/unitDefinations.py" />
+        <option value="$USER_HOME$/Box/Sumitomo-Phase3/Sumitomo dashboard/Data_manager.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyControllers/Controllers/HelicsController.py" />
+        <option value="$PROJECT_DIR$/../PyDSS-Projects/EPRI_J1/DSSfiles/PV_sceenario_generator.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyControllers/Controllers/PvControllerGen.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyControllers/pyController.py" />
+        <option value="$PROJECT_DIR$/PyDSS/SolveMode.py" />
+        <option value="$PROJECT_DIR$/PyDSS.py" />
+        <option value="$PROJECT_DIR$/../Helics Example/Broker2.py" />
+        <option value="$PROJECT_DIR$/../Helics Example/pireciever.py" />
+        <option value="$PROJECT_DIR$/../Helics Example/pisender.py" />
+        <option value="$PROJECT_DIR$/PyDSS/ResultContainer.py" />
+        <option value="$PROJECT_DIR$/../PSLF_file_modifier.py" />
+        <option value="$PROJECT_DIR$/PyDSS/pyContrReader.py" />
+        <option value="$PROJECT_DIR$/PyDSS/dssElement.py" />
+        <option value="$PROJECT_DIR$/PyDSS/dssInstance.py" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
+<<<<<<< HEAD
     <option name="x" value="1912" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
     <option name="height" value="1056" />
+=======
+    <option name="x" value="2073" />
+    <option name="y" value="-17" />
+    <option name="width" value="1550" />
+    <option name="height" value="840" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
   </component>
   <component name="ProjectId" id="1SYvJrILuoO87d1kroLO1gXiIyJ" />
   <component name="ProjectView">
@@ -293,12 +448,14 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
               <item name="PyDSS" type="b2602c69:ProjectViewProjectNode" />
               <item name="PyDSS" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
             </path>
             <path>
               <item name="PyDSS" type="b2602c69:ProjectViewProjectNode" />
@@ -310,6 +467,8 @@
               <item name="PyDSS" type="462c0819:PsiDirectoryNode" />
               <item name="PyDSS" type="462c0819:PsiDirectoryNode" />
               <item name="pyAnalyzer" type="462c0819:PsiDirectoryNode" />
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
             </path>
             <path>
               <item name="PyDSS" type="b2602c69:ProjectViewProjectNode" />
@@ -320,6 +479,10 @@
             </path>
             <path>
               <item name="PyDSS" type="b2602c69:ProjectViewProjectNode" />
+<<<<<<< HEAD
+=======
+              <item name="PyDSS" type="462c0819:PsiDirectoryNode" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
               <item name="PyDSS" type="462c0819:PsiDirectoryNode" />
               <item name="PyDSS" type="462c0819:PsiDirectoryNode" />
               <item name="pyPlots" type="462c0819:PsiDirectoryNode" />
@@ -331,16 +494,18 @@
               <item name="pyPlots" type="462c0819:PsiDirectoryNode" />
               <item name="Plots" type="462c0819:PsiDirectoryNode" />
             </path>
+<<<<<<< HEAD
             <path>
               <item name="PyDSS" type="b2602c69:ProjectViewProjectNode" />
               <item name="PyDSS" type="462c0819:PsiDirectoryNode" />
               <item name="tests" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -368,20 +533,30 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Python.pyDSS">
     <configuration name="dssSingleRun" type="PythonConfigurationType" factoryName="Python">
+=======
+  <component name="RunManager" selected="Python.PSLF_file_modifier (1)">
+    <configuration name="Data_manager" type="PythonConfigurationType" factoryName="Python" temporary="true">
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <module name="PyDSS-heco" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
+<<<<<<< HEAD
       <option name="SDK_HOME" value="C:\ProgramData\Anaconda3\python.exe" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bin" />
+=======
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$USER_HOME$/Box/Sumitomo-Phase3/Sumitomo dashboard" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/bin/dssSingleRun.py" />
+      <option name="SCRIPT_NAME" value="$USER_HOME$/Box/Sumitomo-Phase3/Sumitomo dashboard/Data_manager.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -390,7 +565,11 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+<<<<<<< HEAD
     <configuration name="pyDSS" type="PythonConfigurationType" factoryName="Python" temporary="true">
+=======
+    <configuration name="PSLF_file_modifier (1)" type="PythonConfigurationType" factoryName="Python" temporary="true">
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <module name="PyDSS-heco" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -398,11 +577,19 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
+<<<<<<< HEAD
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/PyDSS" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/PyDSS/pyDSS.py" />
+=======
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../PSLF_file_modifier.py" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -411,7 +598,11 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+<<<<<<< HEAD
     <configuration name="run_pyDSS (1)" type="PythonConfigurationType" factoryName="Python" temporary="true">
+=======
+    <configuration name="PSLF_file_modifier" type="PythonConfigurationType" factoryName="Python" temporary="true">
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <module name="PyDSS-heco" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -419,11 +610,40 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
+<<<<<<< HEAD
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/External_interfacing_example/Helics_example" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/examples/External_interfacing_example/Helics_example/run_pyDSS.py" />
+=======
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../Solar distric cup usecases/JBG_Smith_Usecase" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../Solar distric cup usecases/JBG_Smith_Usecase/PSLF_file_modifier.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <configuration name="PV_sceenario_generator" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="PyDSS-heco" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../PyDSS-Projects/EPRI_J1/DSSfiles" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../PyDSS-Projects/EPRI_J1/DSSfiles/PV_sceenario_generator.py" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -432,7 +652,11 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+<<<<<<< HEAD
     <configuration name="run_pyDSS (2)" type="PythonConfigurationType" factoryName="Python" temporary="true">
+=======
+    <configuration name="PyDSS" type="PythonConfigurationType" factoryName="Python" temporary="true">
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <module name="PyDSS-heco" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -444,7 +668,11 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
+<<<<<<< HEAD
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/examples/External_interfacing_example/API_example/run_pyDSS.py" />
+=======
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/PyDSS.py" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -453,13 +681,18 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+<<<<<<< HEAD
     <configuration name="run_pyDSS" type="PythonConfigurationType" factoryName="Python" temporary="true">
+=======
+    <configuration name="dssSingleRun" type="PythonConfigurationType" factoryName="Python">
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <module name="PyDSS-heco" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
+<<<<<<< HEAD
       <option name="SDK_HOME" value="" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/External_interfacing example/Helics_example" />
       <option name="IS_MODULE_SDK" value="true" />
@@ -487,6 +720,14 @@
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/examples/External_interfacing_example/Socket_example/run_socket_controller.py" />
+=======
+      <option name="SDK_HOME" value="/usr/local/bin/python3" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/bin" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/bin/dssSingleRun.py" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -496,7 +737,13 @@
       <method v="2" />
     </configuration>
     <list>
+      <item itemvalue="Python.Data_manager" />
+      <item itemvalue="Python.PSLF_file_modifier (1)" />
+      <item itemvalue="Python.PSLF_file_modifier" />
+      <item itemvalue="Python.PV_sceenario_generator" />
+      <item itemvalue="Python.PyDSS" />
       <item itemvalue="Python.dssSingleRun" />
+<<<<<<< HEAD
       <item itemvalue="Python.pyDSS" />
       <item itemvalue="Python.run_pyDSS" />
       <item itemvalue="Python.run_pyDSS (1)" />
@@ -510,6 +757,16 @@
         <item itemvalue="Python.run_pyDSS (2)" />
         <item itemvalue="Python.run_pyDSS (1)" />
         <item itemvalue="Python.run_pyDSS" />
+=======
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python.PSLF_file_modifier (1)" />
+        <item itemvalue="Python.PyDSS" />
+        <item itemvalue="Python.PV_sceenario_generator" />
+        <item itemvalue="Python.Data_manager" />
+        <item itemvalue="Python.PSLF_file_modifier" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
       </list>
     </recent_temporary>
   </component>
@@ -549,7 +806,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
+<<<<<<< HEAD
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30663857" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
@@ -602,10 +861,55 @@
       </map>
     </option>
   </component>
+=======
+      <window_info id="Structure" order="0" sideWeight="0.509299" side_tool="true" weight="0.44121715" />
+      <window_info id="Favorites" order="1" sideWeight="0.5275862" side_tool="true" weight="0.15542677" />
+      <window_info content_ui="combo" id="Project" order="2" sideWeight="0.490701" visible="true" weight="0.18710022" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32763532" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.8424242" weight="0.80931747" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.91675615" weight="0.5557963" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49573562" weight="0.3041145" />
+      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.4978678" weight="0.32827735" />
+      <window_info anchor="bottom" id="Version Control" order="8" weight="0.33880422" />
+      <window_info anchor="bottom" id="Python Console" order="9" sideWeight="0.4978678" weight="0.32719395" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" x="2064" y="290" width="1736" height="896" id="Documentation" order="3" type="FLOATING" />
+      <window_info anchor="right" id="Data View" order="4" weight="0.08198121" />
+      <window_info anchor="right" id="Event Log" order="5" sideWeight="0.15757576" side_tool="true" weight="0.20255864" />
+    </layout>
+    <layout-to-restore>
+      <window_info id="Structure" order="0" sideWeight="0.509299" side_tool="true" weight="0.44121715" />
+      <window_info id="Favorites" order="1" sideWeight="0.5275862" side_tool="true" weight="0.15542677" />
+      <window_info content_ui="combo" id="Project" order="2" sideWeight="0.490701" visible="true" weight="0.24040511" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32763532" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.8424242" visible="true" weight="0.24593717" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.91675615" weight="0.4127844" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49573562" weight="0.3041145" />
+      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.4978678" weight="0.32827735" />
+      <window_info anchor="bottom" id="Version Control" order="8" weight="0.33880422" />
+      <window_info anchor="bottom" id="Python Console" order="9" sideWeight="0.4978678" weight="0.32719395" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" x="2064" y="290" width="1736" height="896" id="Documentation" order="3" type="FLOATING" />
+      <window_info anchor="right" id="Data View" order="4" weight="0.08198121" />
+      <window_info anchor="right" id="Event Log" order="5" sideWeight="0.15757576" side_tool="true" weight="0.24664879" />
+    </layout-to-restore>
+  </component>
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+<<<<<<< HEAD
           <url>file://$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssPDFplot.py</url>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
@@ -615,6 +919,84 @@
           <option name="timeStamp" value="2" />
         </line-breakpoint>
       </breakpoints>
+=======
+          <url />
+          <line>61</line>
+          <option name="timeStamp" value="313" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url />
+          <line>8</line>
+          <option name="timeStamp" value="27" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url />
+          <line>19</line>
+          <option name="timeStamp" value="39" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS/PyPlots/Plots/Topology.py</url>
+          <option name="timeStamp" value="46" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS/PyPlots/Plots/TimeSeries.py</url>
+          <line>45</line>
+          <option name="timeStamp" value="47" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS/ResultContainer.py</url>
+          <line>240</line>
+          <option name="timeStamp" value="315" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS/SolveMode.py</url>
+          <line>22</line>
+          <option name="timeStamp" value="320" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS.py</url>
+          <line>8</line>
+          <option name="timeStamp" value="321" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS.py</url>
+          <line>33</line>
+          <option name="timeStamp" value="323" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS.py</url>
+          <line>113</line>
+          <option name="timeStamp" value="324" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS/SolveMode.py</url>
+          <line>200</line>
+          <option name="timeStamp" value="325" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS/SolveMode.py</url>
+          <line>109</line>
+          <option name="timeStamp" value="326" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/PyDSS/pyControllers/Controllers/PvControllerGen.py</url>
+          <line>47</line>
+          <option name="timeStamp" value="329" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/../PSLF_file_modifier.py</url>
+          <line>37</line>
+          <option name="timeStamp" value="330" />
+        </line-breakpoint>
+      </breakpoints>
+      <default-breakpoints>
+        <breakpoint type="python-exception">
+          <properties notifyOnTerminate="true" exception="BaseException">
+            <option name="notifyOnTerminate" value="true" />
+          </properties>
+        </breakpoint>
+      </default-breakpoints>
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
     </breakpoint-manager>
   </component>
   <component name="debuggerHistoryManager">
@@ -641,6 +1023,7 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/setup.py">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="433">
           <caret line="28" selection-start-line="28" selection-end-line="28" />
         </state>
@@ -771,11 +1154,71 @@
           <folding>
             <element signature="e#41#54#0" expanded="true" />
           </folding>
+=======
+        <state relative-caret-position="582">
+          <caret line="40" column="43" selection-start-line="40" selection-start-column="43" selection-end-line="40" selection-end-column="43" />
+          <folding>
+            <element signature="e#22#31#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/PyDSS/pyControllers/Controllers/SocketController.py">
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/matplotlib/contour.py">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3637">
+          <caret line="991" column="15" selection-start-line="991" selection-start-column="13" selection-end-line="991" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/matplotlib/artist.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="915" selection-start-line="915" selection-end-line="915" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/matplotlib/axes/_base.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2041">
+          <caret line="505" selection-start-line="505" selection-end-line="505" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/matplotlib/cm.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/pandas/core/reshape/reshape.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="188">
+          <caret line="165" selection-start-line="165" selection-end-line="165" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/matplotlib/colors.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="272" selection-start-line="272" selection-end-line="272" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/seaborn/axisgrid.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="213">
+          <caret line="1708" selection-start-line="1708" selection-end-line="1708" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/seaborn/distributions.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="609">
+          <caret line="224" selection-start-line="224" selection-end-line="224" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/pandas/plotting/_core.py">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="306">
           <caret line="20" selection-start-line="20" selection-end-line="20" />
           <folding>
@@ -887,21 +1330,124 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2720">
           <caret line="86" column="23" lean-forward="true" selection-start-line="86" selection-start-column="23" selection-end-line="86" selection-end-column="23" />
+=======
+        <state relative-caret-position="18156">
+          <caret line="1098" selection-start-line="1098" selection-end-line="1098" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/pandas/core/generic.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160344">
+          <caret line="9481" selection-start-line="9481" selection-end-line="9481" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/seaborn/relational.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="841">
+          <caret line="1318" column="4" selection-start-line="1318" selection-start-column="4" selection-end-line="1318" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyAnalyzer/dssGraphicsGenerator.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1853">
+          <caret line="114" column="23" selection-start-line="114" selection-start-column="23" selection-end-line="114" selection-end-column="23" />
+          <folding>
+            <element signature="e#1#72#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssPDFplot.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4879">
+          <caret line="292" column="8" selection-start-line="292" selection-start-column="8" selection-end-line="292" selection-end-column="8" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssProfilePlot.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="661">
+          <caret line="259" column="60" selection-start-line="259" selection-start-column="56" selection-end-line="259" selection-end-column="60" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssXYplot.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="661">
+          <caret line="47" column="64" selection-start-line="47" selection-start-column="64" selection-end-line="47" selection-end-column="64" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyAnalyzer/dssPlots/dssVoltageDistance.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="12" column="31" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Temp/1/Temp1_helics feeder (002).zip/helics feeder/feeder.py" />
+    <entry file="file://$USER_HOME$/AppData/Local/Temp/1/Temp1_helics feeder (002).zip/helics feeder/constants.py" />
+    <entry file="file://$USER_HOME$/AppData/Local/Temp/1/Temp1_helics feeder (002).zip/helics feeder/agents/Feeder.py" />
+    <entry file="file://$USER_HOME$/AppData/Local/Temp/1/Temp1_helics feeder (002).zip/helics feeder/agents/Agent.py" />
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/pandas/io/common.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1792">
+          <caret line="423" selection-start-line="423" selection-end-line="423" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyControllers/Controllers/Helics.py" />
+    <entry file="file://$PROJECT_DIR$/PyDSS/unitDefinations.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="42" column="30" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Box/Sumitomo-Phase3/Sumitomo dashboard/Data_manager.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="23" column="37" lean-forward="true" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
           <folding>
             <element signature="e#0#31#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/PyDSS/dssElement.py">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
             <element signature="e#0#31#0" expanded="true" />
+=======
+    <entry file="file://$PROJECT_DIR$/../HELICS-2.2.0/tests/python/test_message_federate.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/PyDSS/Extensions/MonteCarlo.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="85">
@@ -936,27 +1482,125 @@
           <caret line="86" selection-start-line="86" selection-end-line="86" />
           <folding>
             <element signature="e#0#54#0" expanded="true" />
+=======
+    <entry file="file://$PROJECT_DIR$/../HELICS-2.2.0/tests/python/test_message_filter.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2108">
+          <caret line="126" column="44" selection-start-line="126" selection-start-column="3" selection-end-line="126" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Box/Sumitomo-Phase3/Sumitomo dashboard/Bill_calculator.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4012">
+          <caret line="253" column="42" selection-start-line="253" selection-start-column="8" selection-end-line="253" selection-end-column="42" />
+          <folding>
+            <element signature="e#0#48#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/pandas/core/tools/timedeltas.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="20" selection-start-line="1" selection-start-column="20" selection-end-line="1" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../HELICS-2.2.0/tests/python/test_value_federate.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
+          </folding>
+        </state>
+      </provider>
+    </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/test.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
           <caret line="4" column="49" selection-start-line="4" selection-start-column="49" selection-end-line="4" selection-end-column="49" />
+=======
+    <entry file="file://$PROJECT_DIR$/../PyDSS-Projects/EPRI_J1/DSSfiles/PV_sceenario_generator.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="663">
+          <caret line="39" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/dssBus.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="476">
+          <caret line="43" column="28" selection-start-line="43" selection-start-column="28" selection-end-line="43" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyControllers/Controllers/StorageController.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="160" column="58" selection-start-line="160" selection-start-column="58" selection-end-line="160" selection-end-column="58" />
+          <folding>
+            <element signature="e#0#72#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/toml/decoder.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="337">
+          <caret line="469" column="42" lean-forward="true" selection-start-line="469" selection-start-column="42" selection-end-line="469" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.PyCharmCE2019.1/system/python_stubs/-313451744/builtins.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="199">
+          <caret line="488" column="4" selection-start-line="488" selection-start-column="4" selection-end-line="488" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyControllers/Controllers/PvController.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="114" column="20" selection-start-line="74" selection-end-line="114" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#72#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyControllers/Controllers/HelicsController.py" />
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyControllers/Controllers/PvControllerGen.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="544">
+          <caret line="386" column="3" lean-forward="true" selection-start-line="386" selection-start-column="3" selection-end-line="386" selection-end-column="3" />
+          <folding>
+            <element signature="e#0#72#0" expanded="true" />
+          </folding>
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/PyDSS/SolveMode.py">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="761">
           <caret line="76" column="14" selection-start-line="76" selection-start-column="14" selection-end-line="76" selection-end-column="14" />
+=======
+        <state relative-caret-position="892">
+          <caret line="174" column="26" lean-forward="true" selection-start-line="174" selection-start-column="26" selection-end-line="174" selection-end-column="26" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
           <folding>
             <element signature="e#0#40#0" expanded="true" />
+            <element signature="e#8428#10225#0" />
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/PyDSS/ResultContainer.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -973,16 +1617,114 @@
           <caret line="327" column="11" selection-start-line="327" selection-start-column="11" selection-end-line="327" selection-end-column="11" />
           <folding>
             <element signature="e#0#55#0" expanded="true" />
+=======
+    <entry file="file://$PROJECT_DIR$/../Helics Example/Broker.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/helics.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="563" selection-start-line="563" selection-end-line="563" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyContrReader.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="2" column="9" lean-forward="true" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../PSLF_file_modifier.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="663">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/PyDSS/pyDSS.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
           <caret line="197" column="47" selection-start-line="197" selection-start-column="47" selection-end-line="197" selection-end-column="47" />
           <folding>
             <element signature="e#0#61#0" expanded="true" />
+=======
+    <entry file="file://$PROJECT_DIR$/PyDSS/pyControllers/pyController.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../Helics Example/pireciever.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="4" column="30" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="30" />
+          <folding>
+            <element signature="e#24#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../Helics Example/pisender.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="663">
+          <caret line="41" column="4" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
+          <folding>
+            <element signature="e#24#35#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../Helics Example/Broker2.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="141" column="30" lean-forward="true" selection-start-line="141" selection-start-column="30" selection-end-line="141" selection-end-column="30" />
+          <folding>
+            <element signature="e#0#61#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/ResultContainer.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="21" column="25" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="25" />
+          <folding>
+            <element signature="e#0#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/dssInstance.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="518">
+          <caret line="357" selection-start-line="357" selection-end-line="358" />
+          <folding>
+            <element signature="e#0#55#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PyDSS/dssElement.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="773">
+          <caret line="131" column="9" lean-forward="true" selection-start-line="131" selection-start-column="9" selection-end-line="131" selection-end-column="9" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
           </folding>
         </state>
       </provider>
diff --git a/LICENSE b/LICENSE
index d99bc54e..08d019dc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -4,10 +4,20 @@ Copyright (c) 2018, Alliance for Sustainable Energy LLC, All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
+<<<<<<< HEAD
 - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
 - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
 - Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=======
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
diff --git a/PyDSS.py b/PyDSS.py
new file mode 100644
index 00000000..3328870f
--- /dev/null
+++ b/PyDSS.py
@@ -0,0 +1,180 @@
+from PyDSS.pyAnalyzer.dssSimulationResult import ResultObject
+from PyDSS.pyAnalyzer.dssGraphicsGenerator import CreatePlots
+from PyDSS import dssInstance
+import subprocess
+import click
+import toml
+import sys
+import os
+
+
+
+valid_settings = {
+        'Log Results' : {'type': bool, 'Options': [True, False]},
+        'Return Results': {'type': bool, 'Options': [True, False]},
+        'Export Mode': {'type': str, 'Options': ["byClass", "byElement"]},
+        'Export Style': {'type': str, 'Options': ["Single file", "Separate files"]},
+
+        'Create dynamic plots': {'type': bool, 'Options': [True, False]},
+        'Open plots in browser': {'type': bool, 'Options': [True, False]},
+
+        'Project Path': {'type': str},
+        'Start Year' : {'type': int, 'Options': range(1970, 2099)},
+        'Start Day' : {'type': int, 'Options': range(0, 365)},
+        'Start Time (min)' : {'type': float, 'Options': range(0, 1440)},
+        'End Day' : {'type': int, 'Options': range(0, 365)},
+        'End Time (min)' : {'type': float, 'Options': range(0, 1440)},
+        'Date offset' : {'type': int, 'Options': range(0, 365)},
+        'Step resolution (sec)' : {'type': float},
+        'Max Control Iterations' : {'type': int},
+        'Error tolerance' : {'type': float},
+        'Simulation Type' : {'type': str, 'Options': ["QSTS", "Dynamic", "Snapshot", "Monte Carlo"]},
+        'Active Project' : {'type': str},
+        'Active Scenario' : {'type': str},
+        'DSS File' : {'type': str},
+
+        'Co-simulation Mode': {'type': bool, 'Options': [True, False]},
+        'Federate name' : {'type': str},
+        'Time delta' : {'type': float},
+        'Core type' : {'type': str},
+        'Uninterruptible' : {'type': bool, 'Options': [True, False]},
+        'Helics logging level' : {'type': int, 'Options': range(0, 10)},
+
+
+        'Logging Level' : {'type': str, 'Options': ["DEBUG", "INFO", "WARNING" , "ERROR"]},
+        'Log to external file'  : {'type': bool, 'Options': [True, False]},
+        'Display on screen' : {'type': bool, 'Options': [True, False]},
+        'Clear old log file' : {'type': bool, 'Options': [True, False]},
+
+        'Control mode' : {'type': str, 'Options': ["Static", "Time"]},
+        'Disable PyDSS controllers' : {'type': bool, 'Options': [True, False]},
+
+        'Enable frequency sweep' : {'type': bool, 'Options': [True, False]},
+        'Fundamental frequency' : {'type': int, 'Options': [50, 60]},
+        'Start frequency' : {'type': float},
+        'End frequency' : {'type': float},
+        'frequency increment' : {'type': float},
+        'Neglect shunt admittance' : {'type': bool, 'Options': [True, False]},
+        'Percentage load in series' : {'type': float, 'Options': range(0, 100)},
+
+        'Number of Monte Carlo scenarios' : {'type': int},
+}
+
+def RunSimulations(Batch_TOML_file):
+    settings_text = ''
+    f = open(Batch_TOML_file, "r")
+    text = settings_text.join(f.readlines())
+    Simulations_args = toml.loads(text)
+    f.close()
+    SimulationResults = {}
+
+    if Simulations_args['Simulations']['Run_bokeh_server']:
+        BokehServer = subprocess.Popen(["bokeh", "serve"], stdout=subprocess.PIPE)
+
+
+    for scenario in Simulations_args['Simulations']['Scenarios']:
+        dss_args, ResultObject = RunScenario(
+            scenario,
+            Simulations_args['Simulations']['Run_simulations'],
+            Simulations_args['Simulations']['Generate_visuals']
+        )
+        SimulationResults['{}-{}-{}-{}-{}'.format(
+            dss_args["Active Project"],
+            dss_args["Active Scenario"],
+            dss_args["Start Year"],
+            dss_args["Start Day"],
+            dss_args["End Day"],
+        )] = (dss_args, ResultObject)
+
+    if Simulations_args['Simulations']['Generate_visuals']:
+        CreatePlots(Simulations_args, SimulationResults)
+
+    if Simulations_args['Simulations']['Run_bokeh_server']:
+        BokehServer.terminate()
+    return
+
+
+def RunScenario(Scenario_TOML_file_path, run_simulation=True, generate_visuals=False):
+    settings_text = ''
+    f = open(Scenario_TOML_file_path, "r")
+    text = settings_text.join(f.readlines())
+    dss_args = toml.loads(text, _dict=dict)
+    __validate_settings(dss_args)
+    dss_args["Start Time (min)"] += 0.3
+    dss_args["End Time (min)"] += 0.3
+    f.close()
+
+    if run_simulation:
+        dss = dssInstance.OpenDSS(**dss_args)
+        print('Running scenario: {}'.format(Scenario_TOML_file_path))
+        if dss_args['Simulation Type'] == "Monte Carlo":
+            #TODO: Fix the broken MC code
+            dss.RunMCsimulation(MCscenarios=dss_args['Number of Monte Carlo scenarios'])
+        else:
+            dss.RunSimulation()
+        dss.DeleteInstance()
+        del dss
+    # dss.CreateGraph(Visualize=True)
+
+    if generate_visuals:
+        return dss_args, ResultObject(os.path.join(
+            dss_args['Project Path'],
+            dss_args["Active Project"],
+            'Exports',
+            dss_args['Active Scenario']
+        ))
+    else:
+        return dss_args, None
+
+def __validate_settings(dss_args):
+    for key, ctype in dss_args.items():
+        assert (key in valid_settings), "'{}' is not a valid PyDSS argument".format(key)
+        assert (isinstance(ctype, valid_settings[key]['type'])), "'{}' can only be a '{}' data type. Was passed {}".format(
+            key, valid_settings[key]['type'], type(ctype)
+        )
+        if 'Options' in valid_settings[key]:
+            if isinstance(valid_settings[key]['Options'], list):
+                assert (ctype in  (valid_settings[key]['Options'])),\
+                    "Invalid argument value '{}'. Possible values are: {}".format(ctype ,valid_settings[key]['Options'])
+            elif isinstance(valid_settings[key]['Options'], range):
+                assert (min(valid_settings[key]['Options']) <= ctype <= max(valid_settings[key]['Options'])), \
+                    "Value '{}' out of bounds for '{}'. Allowable range is: {}-{}".format(
+                        ctype,
+                        key,
+                        min(valid_settings[key]['Options']),
+                        max(valid_settings[key]['Options'])
+                    )
+
+    for key, ctype in valid_settings.items():
+        assert (key in dss_args), "'{}' definition is missing in the TOML file".format(key)
+
+    assert (dss_args['End frequency'] >= dss_args['Start frequency']),\
+        "'End frequency' can not be smaller than 'Start frequency'"
+    assert (dss_args['End Day'] >= dss_args['Start Day']), \
+        "'End day' can not be smaller than 'Start day'"
+    assert (os.path.exists(dss_args['Project Path'])), \
+        "Project path {} does not exist.".format(dss_args['Project Path'])
+    assert (os.path.exists(os.path.join(dss_args['Project Path'], dss_args["Active Project"]))), \
+        "Project '{}' does not exist.".format(dss_args["Active Project"])
+
+    assert (os.path.exists(os.path.join(dss_args['Project Path'],
+                                        dss_args["Active Project"],
+                                        'PyDSS Scenarios',
+                                        dss_args['Active Scenario']))), \
+        "Scenario '{}' does not exist.".format( dss_args['Active Scenario'])
+
+    assert (os.path.exists(os.path.join(dss_args['Project Path'],
+                                        dss_args["Active Project"],
+                                        'DSSfiles',
+                                        dss_args['DSS File']))), \
+        "Master DSS file '{}' does not exist.".format(dss_args['DSS File'])
+    return
+
+if __name__ == '__main__':
+    #Batch_file = r'C:\Users\alatif\Desktop\PyDSS-Projects\MySpohnTest\PyDSS Scenarios\PlotsTOML.toml'
+    #RunSimulations(Batch_file)
+    toml_file_path = r'C:\Users\alatif\Desktop\PyDSS-Projects\MySpohnTest\PyDSS Scenarios\helics\PyDSS_settings.toml'
+    RunScenario(toml_file_path)
+    print('End')
+    # process(sys.argv[3:])
+
diff --git a/PyDSS/PyPlots/Plots/FrequencySweep.py b/PyDSS/PyPlots/Plots/FrequencySweep.py
index 9365e35c..e7a3e6ca 100644
--- a/PyDSS/PyPlots/Plots/FrequencySweep.py
+++ b/PyDSS/PyPlots/Plots/FrequencySweep.py
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 from  PyDSS.pyPlots.pyPlotAbstract import PlotAbstract
 from bokeh.plotting import figure, curdoc
 from bokeh.io import output_file
@@ -7,6 +8,21 @@
 class FrequencySweep(PlotAbstract):
     def __init__(self, PlotProperties, dssBuses, dssObjects, dssCircuit, dssSolver):
         super(FrequencySweep).__init__()
+=======
+from bokeh.plotting import figure, curdoc
+from bokeh.io import output_file
+from bokeh.models import ColumnDataSource, ColorBar, \
+    LinearColorMapper, HoverTool, BoxSelectTool, BoxZoomTool, \
+    PanTool, WheelZoomTool, ResetTool, SaveTool, Label
+from bokeh.palettes import Plasma
+from bokeh.client import push_session
+import pandas as pd
+import numpy as np
+
+
+class FrequencySweep:
+    def __init__(self, PlotProperties, dssBuses, dssObjects, dssCircuit, dssSolver):
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__dssSolver = dssSolver
         self.__dssBuses = dssBuses
         self.__dssObjs = dssObjects
@@ -37,9 +53,12 @@ def __init__(self, PlotProperties, dssBuses, dssObjects, dssCircuit, dssSolver):
         self.__time = dssSolver.GetDateTime()
         return
 
+<<<<<<< HEAD
     def GetSessionID(self):
         return self.session.id
 
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
     def getObjectValue(self, Obj, ObjPpty, Index):
         pptyValue = Obj.GetVariable(ObjPpty)
         if pptyValue is not None:
@@ -82,5 +101,9 @@ def UpdatePlot(self):
         freq = self.__dssSolver.getFrequency()
 
         self.data[self.__PlotProperties['Property']].append(yVal)
+<<<<<<< HEAD
         self.data['frequency'].append(freq[freq])
+=======
+        self.data['frequency'].append(freq)
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.data_source.data = self.data
diff --git a/PyDSS/PyPlots/Plots/GISplot.py b/PyDSS/PyPlots/Plots/GISplot.py
index 1f471f78..88fb78fc 100644
--- a/PyDSS/PyPlots/Plots/GISplot.py
+++ b/PyDSS/PyPlots/Plots/GISplot.py
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 from  PyDSS.pyPlots.pyPlotAbstract import PlotAbstract
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
 from bokeh.models import ColumnDataSource, HoverTool, BoxSelectTool, PanTool, WheelZoomTool, MultiLine, Square, Circle,\
     Triangle
 #from bokeh.tile_providers import CARTODBPOSITRON
@@ -18,6 +21,7 @@
 except ImportError:
     print('Package pyproj not installed. Cannot use GISplot')
     quit()
+<<<<<<< HEAD
 
 class GISplot(PlotAbstract):
 
@@ -30,6 +34,17 @@ def __init__(self,PlotProperties,dssBuses,dssObjectsByClass,dssCircuit, dssSolve
         self.VoltagePhase = 0
         self.CurrentPhase = 0
 
+=======
+
+class GISplot:
+    Vmin = 0.95
+    Vmax = 1.05
+    Imin = 0
+    Imax = 100
+    VoltagePhase = 0
+    CurrentPhase = 0
+    def __init__(self,PlotProperties,dssBuses,dssObjectsByClass,dssCircuit, dssSolver):
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__dssBuses = dssBuses
         self.__dssCircuit = dssCircuit
         self.__PlotProperties = PlotProperties
diff --git a/PyDSS/PyPlots/Plots/Histogram.py b/PyDSS/PyPlots/Plots/Histogram.py
index 6380b64e..94409fc4 100644
--- a/PyDSS/PyPlots/Plots/Histogram.py
+++ b/PyDSS/PyPlots/Plots/Histogram.py
@@ -12,9 +12,14 @@
 import numpy as np
 import math
 
+<<<<<<< HEAD
 class Histogram(PlotAbstract):
 	def __init__(self,PlotProperties, dssBuses, dssObjectsbyClass, dssCircuit, dssSolver):
 		super(Histogram).__init__()
+=======
+class Histogram:
+	def __init__(self,PlotProperties, dssBuses, dssObjectsbyClass, dssCircuit, dssSolver):
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
 		Data = []
 		self.__dssBuses = dssBuses
 		self.__PlotProperties = PlotProperties
@@ -68,9 +73,12 @@ def __init__(self,PlotProperties, dssBuses, dssObjectsbyClass, dssCircuit, dssSo
 		#self.session.show(self.__Figure)
 		return
 
+<<<<<<< HEAD
 	def GetSessionID(self):
 		return self.session.id
 
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
 	def GetFigure(self):
 		return self.__Figure
 
diff --git a/PyDSS/PyPlots/Plots/SagPlot.py b/PyDSS/PyPlots/Plots/SagPlot.py
index 84c0d481..cf0e9abb 100644
--- a/PyDSS/PyPlots/Plots/SagPlot.py
+++ b/PyDSS/PyPlots/Plots/SagPlot.py
@@ -12,9 +12,15 @@
 import numpy as np
 import math
 
+<<<<<<< HEAD
 class SagPlot(PlotAbstract):
 	def __init__(self,PlotProperties, dssBuses, dssObjectsbyClass, dssCircuit, dssSolver):
 		super(SagPlot).__init__()
+=======
+class SagPlot:
+	def __init__(self,PlotProperties, dssBuses, dssObjectsbyClass, dssCircuit, dssSolver):
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
 		self.__dssBuses = dssBuses
 		self.__PlotProperties = PlotProperties
 		self.__dssObjectsByClass = dssObjectsbyClass
diff --git a/PyDSS/PyPlots/Plots/TimeSeries.py b/PyDSS/PyPlots/Plots/TimeSeries.py
index 1fa97a90..328c8c6a 100644
--- a/PyDSS/PyPlots/Plots/TimeSeries.py
+++ b/PyDSS/PyPlots/Plots/TimeSeries.py
@@ -6,9 +6,14 @@
 from bokeh.palettes import Set1
 from ast import literal_eval as LE
 
+<<<<<<< HEAD
 class TimeSeries(PlotAbstract):
     def __init__(self,PlotProperties, dssBuses, dssObjects, dssCircuit, dssSolver):
         super(TimeSeries).__init__()
+=======
+class TimeSeries:
+    def __init__(self,PlotProperties, dssBuses, dssObjects, dssCircuit, dssSolver):
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__dssBuses = dssBuses
         self.__dssObjs = dssObjects
         self.__PlotProperties = PlotProperties
diff --git a/PyDSS/PyPlots/Plots/Topology.py b/PyDSS/PyPlots/Plots/Topology.py
index 6f47cfc6..4cc6fa9f 100644
--- a/PyDSS/PyPlots/Plots/Topology.py
+++ b/PyDSS/PyPlots/Plots/Topology.py
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 from  PyDSS.pyPlots.pyPlotAbstract import PlotAbstract
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
 from bokeh.models import ColumnDataSource, ColorBar, \
     LinearColorMapper, HoverTool, BoxSelectTool, BoxZoomTool, \
     PanTool, WheelZoomTool, ResetTool, SaveTool, Label
@@ -7,9 +10,14 @@
 import pandas as pd
 import numpy as np
 
+<<<<<<< HEAD
 class Topology(PlotAbstract):
     def __init__(self,PlotProperties,dssBuses,dssObjectsByClass,dssCircuit,dssSolver):
         super(Topology).__init__()
+=======
+class Topology:
+    def __init__(self,PlotProperties,dssBuses,dssObjectsByClass,dssCircuit,dssSolver):
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__dssBuses = dssBuses
         self.__dssCircuit = dssCircuit
         self.__PlotProperties = PlotProperties
diff --git a/PyDSS/PyPlots/Plots/XYPlot.py b/PyDSS/PyPlots/Plots/XYPlot.py
index 2eaaf567..7eed8e8a 100644
--- a/PyDSS/PyPlots/Plots/XYPlot.py
+++ b/PyDSS/PyPlots/Plots/XYPlot.py
@@ -10,9 +10,15 @@
 import numpy as np
 
 
+<<<<<<< HEAD
 class XYPlot(PlotAbstract):
     def __init__(self,PlotProperties, dssBuses, dssObjects, dssCircuit, dssSolver):
         super(XYPlot).__init__()
+=======
+class XYPlot:
+    def __init__(self,PlotProperties, dssBuses, dssObjects, dssCircuit, dssSolver):
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__dssBuses = dssBuses
         self.__dssObjs = dssObjects
         self.__dssCircuit = dssCircuit
diff --git a/PyDSS/ResultContainer.py b/PyDSS/ResultContainer.py
old mode 100755
new mode 100644
index 966d40a6..f1565654
--- a/PyDSS/ResultContainer.py
+++ b/PyDSS/ResultContainer.py
@@ -69,6 +69,7 @@ def __createPyDSSfederate(self):
         h.helicsFederateInfoSetFlagOption(fedinfo, h.helics_flag_uninterruptible, True)
         self.__PyDSSfederate = h.helicsCreateValueFederate(self.__Settings['Federate name'], fedinfo)
 
+<<<<<<< HEAD
         return
 
     def __registerFederateSubscriptions(self):
@@ -114,15 +115,69 @@ def updateSubscriptions(self):
 
     def __registerFederatePublications(self):
         self.__publications = {}
+=======
+        return
+
+    def __registerFederateSubscriptions(self):
+        self.FileReader = pySR(os.path.join(self.SystemPaths['ExportLists'], 'Helics-Subcriptions.xlsx'))
+        self.__subscriptions = self.FileReader.SubscriptionDict
+
+        for element, subscription in self.__subscriptions.items():
+            assert element in self.ObjectsByElement, '"{}" listed in the subscription file not '.format(element) +\
+                                                     "available in PyDSS's master object dictionary."
+            if subscription["Subscribe"] == True:
+                sub = h.helicsFederateRegisterSubscription(self.__PyDSSfederate, subscription["Subscription ID"],
+                                                           subscription["Unit"])
+                self.pyLogger.debug('PyDSS subscribing to "{}" of  with units "{}"'.format(
+                    subscription["Subscription ID"],
+                    subscription["Unit"])
+                )
+                subscription['Subscription'] = sub
+            self.__subscriptions[element] = subscription
+        return
+
+    def updateSubscriptions(self):
+        for element, subscriptionData in self.__subscriptions.items():
+            if 'Subscription' in subscriptionData:
+                if subscriptionData['Data type'].lower() == 'double':
+                    value = h.helicsInputGetDouble(subscriptionData['Subscription'])
+                elif subscriptionData['Data type'].lower() == 'vector':
+                    value = h.helicsInputGetVector(subscriptionData['Subscription'])
+                elif subscriptionData['Data type'].lower() == 'string':
+                    value = h.helicsInputGetString(subscriptionData['Subscription'])
+                elif subscriptionData['Data type'].lower() == 'boolean':
+                    value = h.helicsInputGetBoolean(subscriptionData['Subscription'])
+                elif subscriptionData['Data type'].lower() == 'integer':
+                    value = h.helicsInputGetInteger(subscriptionData['Subscription'])
+                dssElement = self.ObjectsByElement[element]
+                dssElement.SetParameter(subscriptionData['Property'], value)
+                self.pyLogger.debug('Value for "{}.{}" changed to "{}"'.format(
+                    element,
+                    subscriptionData['Property'],
+                    value
+                ))
+
+        return
+
+    def __registerFederatePublications(self):
+        self.__publications = {}
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         for object, property_dict in self.CurrentResults.items():
             objClass = None
             for Class in self.ObjectsByClass:
                 if object in self.ObjectsByClass[Class]:
                     objClass = Class
                     break
+<<<<<<< HEAD
             for property, type_dict in property_dict.items():
                 if '{} {}'.format(objClass, property) in self.PublicationList:
 
+=======
+
+            for property, type_dict in property_dict.items():
+                if '{} {}'.format(objClass, property) in self.PublicationList:
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                     for typeID, type in type_dict.items():
                         name = '{}.{}.{}'.format(object, property, typeID)
 
@@ -132,6 +187,10 @@ def __registerFederatePublications(self):
                             type['type'],
                             type['unit']
                         )
+<<<<<<< HEAD
+=======
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                         self.pyLogger.debug('PyDSS publishing "{}" of type "{}" with units "{}"'.format(
                             name,
                             type['type'],
@@ -211,6 +270,7 @@ def CreateListByElement(self):
         return
 
     def __parse_current_values(self, Element, Property, Values):
+<<<<<<< HEAD
 
         ans = self.CurrentResults[Element][Property]
         for filter, data in ans.items():
@@ -221,6 +281,18 @@ def __parse_current_values(self, Element, Property, Values):
             elif filter == '0':
                 ans[filter]['value'] = Values[1::2]
             if self.__Settings['Co-simulation Mode']:
+=======
+        if self.__Settings['Co-simulation Mode']:
+            ans = self.CurrentResults[Element][Property]
+            for filter, data in ans.items():
+                if filter == 'A':
+                    ans[filter]['value'] = Values
+                elif filter == 'E':
+                    ans[filter]['value'] = Values[0::2]
+                elif filter == '0':
+                    ans[filter]['value'] = Values[1::2]
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                 name = '{}.{}.{}'.format(Element, Property, filter)
                 if isinstance(ans[filter]['value'], list) and name in self.__publications:
                     h.helicsPublicationPublishVector(self.__publications[name], ans[filter]['value'])
@@ -277,7 +349,11 @@ def ExportResults(self, fileprefix=''):
         if self.__Settings['Export Mode'] == 'byElement':
             self.__ExportResultsByElements(fileprefix)
         elif self.__Settings['Export Mode'] == 'byClass':
+<<<<<<< HEAD
             self.__ExportResultsByClass(fileprefix)
+=======
+            self.__ExportResultsByClass()
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__ExportEventLog()
 
     def __ExportResultsByClass(self, fileprefix=''):
@@ -308,7 +384,11 @@ def __ExportResultsByClass(self, fileprefix=''):
                         else:
                             ElmLvlHeader = Element + ','
                     if self.__Settings['Export Style'] == 'Separate files':
+<<<<<<< HEAD
                         fname = '-'.join([Class, Property, Element, str(self.__StartDay), str(self.__EndDay) ,fileprefix]) + '.csv'
+=======
+                        fname = '-'.join([Class, Property, Element, str(self.__StartDay), str(self.__EndDay)]) + '.csv'
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                         columns = [x for x in ElmLvlHeader.split(',') if x != '']
                         tuples = list(zip(*[self.__DateTime, self.__Frequency, self.__SimulationMode]))
                         index = pd.MultiIndex.from_tuples(tuples, names=['timestamp', 'frequency', 'Simulation mode'])
@@ -328,7 +408,11 @@ def __ExportResultsByClass(self, fileprefix=''):
                     tuples = list(zip(*[self.__DateTime, self.__Frequency, self.__SimulationMode]))
                     index = pd.MultiIndex.from_tuples(tuples, names=['timestamp', 'frequency', 'Simulation mode'])
                     df = pd.DataFrame(Dataset, index=index, columns=columns)
+<<<<<<< HEAD
                     fname = '-'.join([Class, Property, str(self.__StartDay), str(self.__EndDay), fileprefix]) + '.csv'
+=======
+                    fname = '-'.join([Class, Property, str(self.__StartDay), str(self.__EndDay)]) + '.csv'
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                     df.to_csv(os.path.join(self.ExportFolder, fname))
                     self.pyLogger.info(Class + '-' + Property + ".csv exported to " + self.ExportFolder)
         return
@@ -360,7 +444,11 @@ def __ExportResultsByElements(self, fileprefix=''):
                     Header = Property + ','
 
                 if self.__Settings['Export Style'] == 'Separate files':
+<<<<<<< HEAD
                     fname = '-'.join([Element, Property, str(self.__StartDay), str(self.__EndDay), fileprefix]) + '.csv'
+=======
+                    fname = '-'.join([Element, Property, str(self.__StartDay), str(self.__EndDay)]) + '.csv'
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                     columns = [x for x in Header.split(',') if x != '']
                     tuples = list(zip(*[self.__DateTime, self.__Frequency, self.__SimulationMode]))
                     index = pd.MultiIndex.from_tuples(tuples, names=['timestamp', 'frequency', 'Simulation mode'])
@@ -375,7 +463,11 @@ def __ExportResultsByElements(self, fileprefix=''):
                 if len(ElementDatasets) > 0:
                     for D in ElementDatasets[1:]:
                         Dataset = np.append(Dataset, D, axis=1)
+<<<<<<< HEAD
                 fname = '-'.join([Element, str(self.__StartDay), str(self.__EndDay), fileprefix]) + '.csv'
+=======
+                fname = '-'.join([Element, str(self.__StartDay), str(self.__EndDay)]) + '.csv'
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                 columns = [x for x in AllHeader.split(',') if x != '']
                 tuples = list(zip(*[self.__DateTime, self.__Frequency, self.__SimulationMode]))
                 index = pd.MultiIndex.from_tuples(tuples, names=['timestamp', 'frequency', 'Simulation mode'])
diff --git a/PyDSS/SolveMode.py b/PyDSS/SolveMode.py
old mode 100755
new mode 100644
index 982266e3..0100c539
--- a/PyDSS/SolveMode.py
+++ b/PyDSS/SolveMode.py
@@ -69,7 +69,11 @@ def SimulationSteps(self):
 
     def SolveFor(self, mStartTime, mTimeStep):
         Hour = int(mStartTime/60)
+<<<<<<< HEAD
         Min = mStartTime % 60
+=======
+        Min = mStartTime%60
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__dssSolution.Hour(Hour)
         self.__dssSolution.Seconds(Min*60)
         self.__dssSolution.Number(mTimeStep)
diff --git a/PyDSS/dssElement.py b/PyDSS/dssElement.py
index af6a68cb..55be11d7 100755
--- a/PyDSS/dssElement.py
+++ b/PyDSS/dssElement.py
@@ -126,3 +126,7 @@ def GetParameter(self, Param):
         else:
             print('Could not set ' + self.__Class + '.' + self.__Name + ' as active element.')
             return None
+
+    def __del__(self):
+        self.SetParameter('enabled', 'false')
+        return
\ No newline at end of file
diff --git a/PyDSS/dssInstance.py b/PyDSS/dssInstance.py
old mode 100755
new mode 100644
index 2db84810..24031a7e
--- a/PyDSS/dssInstance.py
+++ b/PyDSS/dssInstance.py
@@ -176,7 +176,11 @@ def __CreatePlots(self, PlotsDict):
                 PlotSettings = PlotNames[Name]
                 PlotSettings['FileName'] = Name
                 if PlotType in PlotType1:
+<<<<<<< HEAD
                     self.__pyPlotObjects[PlotType] = pyPlots.pyPlots.Create(
+=======
+                    self.__pyPlotObjects[PlotType] = PyPlots.pyPlots.Create(
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                         PlotType,
                         PlotSettings,
                         self.__dssBuses,
@@ -188,7 +192,11 @@ def __CreatePlots(self, PlotsDict):
                     #self.BokehDoc.add_root(self.__pyPlotObjects[PlotType].GetFigure())
                     self.__Logger.info('Created pyPlot -> ' + PlotType)
                 elif PlotType in PlotType2:
+<<<<<<< HEAD
                     self.__pyPlotObjects[PlotType + Name] = pyPlots.pyPlots.Create(
+=======
+                    self.__pyPlotObjects[PlotType + Name] = PyPlots.pyPlots.Create(
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                         PlotType,
                         PlotSettings,
                         self.__dssBuses,
@@ -198,7 +206,11 @@ def __CreatePlots(self, PlotsDict):
                     )
                     self.__Logger.info('Created pyPlot -> ' + PlotType)
                 elif PlotType in PlotType3:
+<<<<<<< HEAD
                     self.__pyPlotObjects[PlotType+Name] = pyPlots.pyPlots.Create(
+=======
+                    self.__pyPlotObjects[PlotType+Name] = PyPlots.pyPlots.Create(
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                         PlotType,
                         PlotSettings,
                         self.__dssBuses,
@@ -269,6 +281,7 @@ def __GetRelaventObjectDict(self, key):
         return ObjectList
 
     def RunStep(self, step, updateObjects=None):
+
         if updateObjects:
             for object, params in updateObjects.items():
                 cl, name = object.split('.')
@@ -367,6 +380,15 @@ def CreateGraph(self, Visualize=False):
         return Graph.Get()
 
     def __del__(self):
+<<<<<<< HEAD
+=======
+        x = list(self.__Logger.handlers)
+        for i in x:
+            self.__Logger.removeHandler(i)
+            i.flush()
+            i.close()
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         if self.__DelFlag == 1:
             self.__Logger.info('An instance of OpenDSS (' + str(self) + ') has been deleted.')
         else:
diff --git a/PyDSS/pyAnalyzer/dssGraphicsGenerator.py b/PyDSS/pyAnalyzer/dssGraphicsGenerator.py
index be5e3f65..29fe98a4 100644
--- a/PyDSS/pyAnalyzer/dssGraphicsGenerator.py
+++ b/PyDSS/pyAnalyzer/dssGraphicsGenerator.py
@@ -65,7 +65,10 @@ class CreatePlots:
 
     def __init__(self, simulations_args, simulation_results):
         visualization_args = simulations_args['Visualization']
+<<<<<<< HEAD
         #print(visualization_args)
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         plotting_dict = simulations_args['Plots']
         plots = {}
         for plot_type, required_files in self.required_files.items():
@@ -85,7 +88,11 @@ def __init__(self, simulations_args, simulation_results):
                     plotsettings = visualization_args[plot_type + '_settings']
                     if isinstance(required_files, dict):
                         assert ('Class' in plotsettings), "Settings for plot type '{}' require ".format(plot_type) +\
+<<<<<<< HEAD
                                                           "definition of class variable in the settings dictionary."
+=======
+                                                          "defination of class variable in the settings dictionary."
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                         elm_class = plotsettings['Class']
                         required_files = required_files[elm_class]
                     for each_file in required_files:
@@ -96,7 +103,11 @@ def __init__(self, simulations_args, simulation_results):
                                               "simulation and export the required result file to generate a " +\
                                               "'{}' plot".format(plot_type)
                         keysum = [1 for x in self.plot_groups['Even Odd Filter'] if key.startswith(x + '-')]
+<<<<<<< HEAD
                         if keysum and plot_type not in self.plot_Types['Frequency']:
+=======
+                        if keysum:
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                             scenario_results_formatted[key] = self.__filter_DF_even_odd(scenario_results[key],
                                                                                         plotsettings['Frequency'],
                                                                                         plotsettings['Simulation_mode'])
@@ -104,11 +115,17 @@ def __init__(self, simulations_args, simulation_results):
                             scenario_results_formatted[key] = self.__filter_DF(scenario_results[key],
                                                                                plotsettings['Frequency'],
                                                                                plotsettings['Simulation_mode'])
+<<<<<<< HEAD
 
                         else:
                             scenario_results_formatted[key] = self.__filter_DF_harmonics(scenario_results[key],
                                                                                plotsettings['Frequency'],
                                                                                plotsettings['Time'],
+=======
+                        else:
+                            scenario_results_formatted[key] = self.__filter_DF_harmonics(scenario_results[key],
+                                                                               plotsettings['Timestamp'],
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                                                                                plotsettings['Simulation_mode'])
                         plots[plot_type][scenario_name]['Data'] = scenario_results_formatted
                         plots[plot_type][scenario_name]['Plot_settings'] = plotsettings
@@ -117,6 +134,7 @@ def __init__(self, simulations_args, simulation_results):
 
         self.__create_plots(plots)
 
+<<<<<<< HEAD
     def __filter_DF_harmonics(self, data, baseFreq, time, simulation_mode):
         datax = data.copy()
         datax['Time'] = datax.index
@@ -125,6 +143,13 @@ def __filter_DF_harmonics(self, data, baseFreq, time, simulation_mode):
         datax = datax[datax['Simulation mode'] == simulation_mode]
         datax.index = datax['frequency']
         datax = datax[datax.columns[2:-1]]
+=======
+    def __filter_DF_harmonics(self, data, time, simulation_mode):
+        datax = data.copy()
+        data['Time'] = data.index
+        datax = datax[datax['Simulation mode'] == simulation_mode]
+        datax = datax[datax.columns[2:]]
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         return (datax, None)
 
     def __create_plots(self, plots):
@@ -150,6 +175,13 @@ def __check_result_existance(self, results, result_key):
         return relevant_key
 
     def __filter_DF_even_odd(self, data, frequecy, simulation_mode):
+<<<<<<< HEAD
+=======
+        # print('###################################################')
+        # print(simulation_mode)
+        # print(data)
+        # print('')
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         datax = data[data['frequency'] == frequecy].copy()
         datax = datax[datax['Simulation mode'] == simulation_mode]
         datax = datax[datax.columns[2:]]
diff --git a/PyDSS/pyAnalyzer/dssPlots/dssFrequencySweep.py b/PyDSS/pyAnalyzer/dssPlots/dssFrequencySweep.py
index bab504fd..0717b078 100644
--- a/PyDSS/pyAnalyzer/dssPlots/dssFrequencySweep.py
+++ b/PyDSS/pyAnalyzer/dssPlots/dssFrequencySweep.py
@@ -1,13 +1,18 @@
+<<<<<<< HEAD
 import matplotlib.pyplot as plt
 import seaborn as sbn
 import pandas as pd
 import numpy as np
 import warnings
 import pathlib
+=======
+import pandas as pd
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
 import os
 
 class Plot:
 
+<<<<<<< HEAD
     def __init__(self, plot_type, plot_data):
         scenario_number = 0
         colors = ["#9b59b6", "#3498db", "#95a5a6", "#e74c3c", "#34495e", "#2ecc71"]
@@ -106,4 +111,27 @@ def save_file(self, figure, path, scenario,plot_type, extension):
         figure.savefig(figpath)
         plt.close(figure)
         print("File saved: {}".format(figpath))
+=======
+    def __init__(self, visualization_args, simulation_results):
+        print(simulation_results)
+        self.simulation_results_dict = simulation_results
+        self.visualization_args = visualization_args
+
+        if visualization_args['Voltage_PDF']:
+            self.__create_voltage_pdf_plot(visualization_args, simulation_results)
+        #print(self.simulation_results_dict)
+        return
+
+    def __create_voltage_pdf_plot(self, visualization_args, simulation_results):
+        width = visualization_args['Global_width'] if visualization_args['Global_override'] else  \
+            visualization_args['Voltage_PDF_settings']['Width']
+        height = visualization_args['Global_height'] if visualization_args['Global_override'] else \
+            visualization_args['Voltage_PDF_settings']['Height']
+        dpi = visualization_args['Global_DPI'] if visualization_args['Global_override'] else \
+            visualization_args['Voltage_PDF_settings']['DPI']
+
+        for simulation_key, result in simulation_results.items():
+            print(result)
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         return
\ No newline at end of file
diff --git a/PyDSS/pyAnalyzer/dssPlots/dssPDFplot.py b/PyDSS/pyAnalyzer/dssPlots/dssPDFplot.py
index 6908bc29..31725f86 100644
--- a/PyDSS/pyAnalyzer/dssPlots/dssPDFplot.py
+++ b/PyDSS/pyAnalyzer/dssPlots/dssPDFplot.py
@@ -2,7 +2,10 @@
 import seaborn as sbn
 import pandas as pd
 import numpy as np
+<<<<<<< HEAD
 import warnings
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
 import pathlib
 import os
 
@@ -99,7 +102,11 @@ def __init__(self, plot_type, plot_data):
             self.save_file(fig, path_single, scenario, '{}-{}'.format(elm_Class, plot_type),
                            visualization_args['FileType'])
             if two_plots:
+<<<<<<< HEAD
                 self.save_file(fig2, path_single, scenario, '{}-{}'.format(elm_Class2, plot_type),
+=======
+                self.save_file(fig2, path_seperate, scenario, '{}-{}'.format(elm_Class2, plot_type),
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                                visualization_args['FileType'])
 
         if plot_type == 'Curtailment':
@@ -293,6 +300,7 @@ def __get_data(self, data, even=True):
 
     def __generate_plot(self,  ax, labels, data, plot_settings, color, scenario, newplot):
         #data.index = pd.to_datetime(data.index)
+<<<<<<< HEAD
         data = data.replace([np.inf, -np.inf], np.nan)
         data = data.dropna()
         try:
@@ -321,6 +329,31 @@ def __generate_plot(self,  ax, labels, data, plot_settings, color, scenario, new
             plt.tight_layout()
         except:
             warnings.warn("Data error: No plot created")
+=======
+        range = np.max(data.values) - np.min(data.values)
+        ax.set_xlim(np.min(data.values) - 0.05 * range,  np.max(data.values) + 0.05 * range)
+        data = data.values.flatten()
+        sbn.distplot(data, ax=ax, label=None, hist_kws=dict(alpha=plot_settings['Fill_alpha']))
+        #                 leg = ax.legend(prop={'size': plot_settings['Legend_font_size']}, frameon=False)
+        # ax = data.plot(ax=ax, color=color, alpha=plot_settings['Fill_alpha'],
+        #                      linewidth=plot_settings['Line_width'])
+
+        ax.set_xlabel(list(labels)[1])
+        ax.set_ylabel('Frequency')
+        if plot_settings['Grid']:
+            ax.grid(color='lightgrey', linestyle='-', linewidth=0.3)
+        if 'Show_operation_regions' in plot_settings and plot_settings['Show_operation_regions'] and newplot:
+            for i, label in enumerate(plot_settings['Y_range_labels']):
+                b1 = ax.axvspan(plot_settings['Y_ranges'][i], plot_settings['Y_ranges'][i + 1], alpha=0.03,
+                                color=plot_settings['Y_range_colors'][i], label='normal loading region')
+                self.legend_lines.append(b1)
+                self.legend_labels.append(label)
+        self.legend_lines.append(ax.lines[-1])
+        self.legend_labels.append(scenario)
+        legend = ax.legend(self.legend_lines, self.legend_labels, frameon=False,
+                           prop={'size': plot_settings['Legend_font_size']})
+        plt.tight_layout()
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         return
 
     def __get_paths(self, simulation_settings):
diff --git a/PyDSS/pyAnalyzer/dssPlots/dssProfilePlot.py b/PyDSS/pyAnalyzer/dssPlots/dssProfilePlot.py
index 03417ea1..7d43095c 100644
--- a/PyDSS/pyAnalyzer/dssPlots/dssProfilePlot.py
+++ b/PyDSS/pyAnalyzer/dssPlots/dssProfilePlot.py
@@ -2,7 +2,10 @@
 import seaborn as sbn
 import pandas as pd
 import numpy as np
+<<<<<<< HEAD
 import warnings
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
 import pathlib
 import os
 
@@ -61,7 +64,11 @@ def __init__(self, plot_type, plot_data):
                 self.curtailment_data[scenario]['Settings'] = plot_settings
                 self.curtailment_data[scenario]['Color'] = colors[scenario_number % len(colors)]
                 self.curtailment_data[scenario]['Path_seperate'] = path_seperate
+<<<<<<< HEAD
                 self.curtailment_data[scenario]['Path_single'] = path_single
+=======
+                self.curtailment_data[scenario]['Path_single'] =path_single
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                 classes = None
                 curtailment_plot = True
 
@@ -85,6 +92,10 @@ def __init__(self, plot_type, plot_data):
                 two_plots, classes = self.__create_xfmr_tap_plot(plot_type, scenario, plot_data, ax, plot_settings,
                                                                  color, create_new_plot)
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
             if classes:
                 elm_Class, elm_Class2 = classes
 
@@ -100,7 +111,11 @@ def __init__(self, plot_type, plot_data):
             self.save_file(fig, path_single, scenario, '{}-{}'.format(elm_Class, plot_type),
                            visualization_args['FileType'])
             if two_plots:
+<<<<<<< HEAD
                 self.save_file(fig2, path_single, scenario, '{}-{}'.format(elm_Class2, plot_type),
+=======
+                self.save_file(fig2, path_seperate, scenario, '{}-{}'.format(elm_Class2, plot_type),
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                                visualization_args['FileType'])
 
         if curtailment_plot:
@@ -293,6 +308,7 @@ def __get_data(self, data, even=True):
         return data_even
 
     def __generate_plot(self,  ax, labels, data, plot_settings, color, scenario, newplot):
+<<<<<<< HEAD
         data = data.replace([np.inf, -np.inf], np.nan)
         data = data.dropna()
         data.index = pd.to_datetime(data.index)
@@ -319,6 +335,29 @@ def __generate_plot(self,  ax, labels, data, plot_settings, color, scenario, new
             plt.tight_layout()
         except:
             warnings.warn("Data error: No plot created")
+=======
+        data.index = pd.to_datetime(data.index)
+        range = np.max(data.values) - np.min(data.values)
+        ax.set_ylim(np.min(data.values) - 0.05 * range,  np.max(data.values) + 0.05 * range)
+        ax = data.plot(ax=ax, color=color, alpha=plot_settings['Line_alpha'],
+                             linewidth=plot_settings['Line_width'])
+
+        ax.set_xlabel(list(labels)[0])
+        ax.set_ylabel(list(labels)[1])
+        if plot_settings['Grid']:
+            ax.grid(color='lightgrey', linestyle='-', linewidth=0.3)
+        if 'Show_operation_regions' in plot_settings and plot_settings['Show_operation_regions'] and newplot:
+            for i, label in enumerate(plot_settings['Y_range_labels']):
+                b1 = ax.axhspan(plot_settings['Y_ranges'][i], plot_settings['Y_ranges'][i + 1], alpha=0.03,
+                                color=plot_settings['Y_range_colors'][i], label='normal loading region')
+                self.legend_lines.append(b1)
+                self.legend_labels.append(label)
+        self.legend_lines.append(ax.lines[-1])
+        self.legend_labels.append(scenario)
+        legend = ax.legend(self.legend_lines, self.legend_labels, frameon=False,
+                           prop={'size': plot_settings['Legend_font_size']})
+        plt.tight_layout()
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         return
 
     def __get_paths(self, simulation_settings):
diff --git a/PyDSS/pyAnalyzer/dssSimulationResult.py b/PyDSS/pyAnalyzer/dssSimulationResult.py
index 4890adc9..c0d3a148 100644
--- a/PyDSS/pyAnalyzer/dssSimulationResult.py
+++ b/PyDSS/pyAnalyzer/dssSimulationResult.py
@@ -10,6 +10,10 @@ def __init__(self, resultPath):
         for result in self.__result_files:
             if result != 'event_log.csv':
                 self.__result_dict[result.replace('.csv', '')] = pd.read_csv(os.path.join(resultPath, result), index_col=0)
+<<<<<<< HEAD
+=======
+                #print(self.__result_dict[result.replace('.csv', '')])
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         return
 
     def get_results(self):
diff --git a/PyDSS/pyContrReader.py b/PyDSS/pyContrReader.py
old mode 100755
new mode 100644
index 7d0616ed..c5505d8a
--- a/PyDSS/pyContrReader.py
+++ b/PyDSS/pyContrReader.py
@@ -7,8 +7,13 @@ def __init__(self, Path):
         self.pyControllers = {}
         filenames = os.listdir(Path)
         for filename in filenames:
+<<<<<<< HEAD
             print(filename)
             if filename.endswith('.xlsx') and not filename.startswith('~$'):
+=======
+
+            if filename.endswith('.xlsx'):
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
                 pyControllerType  = filename.split('.')[0]
                 filepath = os.path.join(Path, filename)
                 assert (os.path.exists(filepath)), 'path: "{}" does not exist!'.format(filepath)
@@ -33,7 +38,11 @@ def __init__(self, filePath):
         fileColumns = set(SubscriptionData.columns)
         diff  = requiredColumns.difference(fileColumns)
 
+<<<<<<< HEAD
         assert (len(diff) == 0), 'Missing column in the subscriptions file.\nRequired columns: {}'.format(
+=======
+        assert (len(diff) == 0), 'Missing column in the scbscriptions file \nRequired columns: {}'.format(
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
             requiredColumns
         )
         Subscribe = SubscriptionData['Subscribe']
diff --git a/PyDSS/pyControllers/Controllers/FaultController.py b/PyDSS/pyControllers/Controllers/FaultController.py
index 15d8f0db..b2b62190 100644
--- a/PyDSS/pyControllers/Controllers/FaultController.py
+++ b/PyDSS/pyControllers/Controllers/FaultController.py
@@ -1,6 +1,7 @@
 from  PyDSS.pyControllers.pyControllerAbstract import ControllerAbstract
 
 class FaultController(ControllerAbstract):
+<<<<<<< HEAD
     """The class is used to induce faults on bus for dynamic simulation studies. Subclass of the :class:`PyDSS.pyControllers.pyControllerAbstract.ControllerAbstract` abstract class. 
 
     :param FaultObj: A :class:`PyDSS.dssElement.dssElement` object that wraps around an OpenDSS 'Fault' element
@@ -24,6 +25,14 @@ def __init__(self, FaultObj, Settings, dssInstance, ElmObjectList, dssSolver):
         self.P_old = 0
         self.Time = -1
         self.__Locked = False
+=======
+    P_old = 0
+    Time = -1
+
+    __Locked = False
+    def __init__(self, FaultObj, Settings, dssInstance, ElmObjectList, dssSolver):
+        super(FaultController).__init__()
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__dssSolver = dssSolver
         self.__FaultObj = FaultObj
         self.__Settings = Settings
@@ -32,7 +41,10 @@ def __init__(self, FaultObj, Settings, dssInstance, ElmObjectList, dssSolver):
         FaultObj.SetParameter('r', Settings['Fault resistance'])
         print(FaultObj, Settings)
         Class, Name = self.__FaultObj.GetInfo()
+<<<<<<< HEAD
         assert (Class.lower() == 'fault'), 'FaultController works only with an OpenDSS Fault element'
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__Name = 'pyCont_' + Class + '_' + Name
         self.__init_time = dssSolver.GetDateTime()
         self.__Settings['Fault end time (sec)'] = self.__Settings['Fault start time (sec)'] + \
@@ -40,9 +52,12 @@ def __init__(self, FaultObj, Settings, dssInstance, ElmObjectList, dssSolver):
         return
 
     def Update(self, Priority, Time, UpdateResults):
+<<<<<<< HEAD
         """Induces and removes a fault as the simulation runs as per user defined settings. 
         """
 
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         time = (self.__dssSolver.GetDateTime() - self.__init_time).total_seconds()
 
         if time >= self.__Settings['Fault start time (sec)'] and time < self.__Settings['Fault end time (sec)']:
@@ -51,3 +66,15 @@ def Update(self, Priority, Time, UpdateResults):
             self.__FaultObj.SetParameter('enabled', 'no')
         return 0
 
+<<<<<<< HEAD
+=======
+    # def __EnableLock(self):
+    #     self.__ControlledElm.SetParameter('enabled','False')
+    #     return True
+    #
+    # def __DisableLock(self):
+    #     self.__ControlledElm.SetParameter('enabled', 'True')
+    #     #self.__ControlledElm.SetParameter('enabled', 'False')
+    #     return False
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
diff --git a/PyDSS/pyControllers/Controllers/PvController.py b/PyDSS/pyControllers/Controllers/PvController.py
index 732ac15b..6a079fab 100644
--- a/PyDSS/pyControllers/Controllers/PvController.py
+++ b/PyDSS/pyControllers/Controllers/PvController.py
@@ -22,6 +22,7 @@ def __init__(self, PvObj, Settings, dssInstance, ElmObjectList, dssSolver):
         """Constructor method
         """
         super(PvController).__init__()
+<<<<<<< HEAD
 
         self.TimeChange = False
         self.Time = (-1, 0)
@@ -32,6 +33,8 @@ def __init__(self, PvObj, Settings, dssInstance, ElmObjectList, dssSolver):
         self.__vDisconnected = False
         self.__pDisconnected = False
 
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__ElmObjectList = ElmObjectList
         #print(PvObj.Bus[0] + ' - ' + PvObj.sBus[0].GetInfo())
         self.ControlDict = {
@@ -159,13 +162,17 @@ def CutoffControl(self):
         return 0
 
     def CPFcontrol(self):
+<<<<<<< HEAD
         """Constant power factor implementation
         """
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         PFset = self.__Settings['pf']
         PFact = self.__ControlledElm.GetParameter('pf')
         Ppv = abs(sum(self.__ControlledElm.GetVariable('Powers')[::2]))/ self.__Srated
         Qpv = -sum(self.__ControlledElm.GetVariable('Powers')[1::2])/ self.__Srated
 
+<<<<<<< HEAD
 
         if self.__Settings['cpf-priority'] == 'PF':
            # if self.TimeChange:
@@ -187,6 +194,29 @@ def CPFcontrol(self):
 
         Error = abs(PFset + PFact)
 
+=======
+
+        if self.__Settings['cpf-priority'] == 'PF':
+           # if self.TimeChange:
+            Plim = PFset * 100
+            self.__ControlledElm.SetParameter('pctPmpp', Plim)
+           # else:
+        else:
+            if self.__Settings['cpf-priority'] == 'Var':
+                #add code for var priority here
+                Plim = 0
+            else:
+                Plim = 1
+            if self.TimeChange:
+                self.Pmppt = 100
+            else:
+                self.Pmppt = Plim  * self.__Srated
+            #print(self.Pmppt , self.__Srated)
+
+
+        Error = abs(PFset + PFact)
+
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__ControlledElm.SetParameter('pf', str(-PFset))
         return Error
 
diff --git a/PyDSS/pyControllers/Controllers/PvControllerGen.py b/PyDSS/pyControllers/Controllers/PvControllerGen.py
index 5ab4a4a7..f6951ab7 100644
--- a/PyDSS/pyControllers/Controllers/PvControllerGen.py
+++ b/PyDSS/pyControllers/Controllers/PvControllerGen.py
@@ -7,6 +7,7 @@
 import os
 
 class PvControllerGen(ControllerAbstract):
+<<<<<<< HEAD
     """Implementation of IEEE1547-2003 and IEEE1547-2018 voltage ride-through standards using the OpenDSS Generator model. Subclass of the :class:`PyDSS.pyControllers.pyControllerAbstract.ControllerAbstract` abstract class.
 
             :param PvObj: A :class:`PyDSS.dssElement.dssElement` object that wraps around an OpenDSS 'Generator' element
@@ -22,6 +23,8 @@ class PvControllerGen(ControllerAbstract):
             :raises: AssertionError if 'PvObj' is not a wrapped OpenDSS Generator element
 
     """
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
     def __init__(self, PvObj, Settings, dssInstance, ElmObjectList, dssSolver):
         super(PvControllerGen).__init__()
 
@@ -51,7 +54,10 @@ def __init__(self, PvObj, Settings, dssInstance, ElmObjectList, dssSolver):
         self.__Settings = Settings
 
         Class, Name = self.__ControlledElm.GetInfo()
+<<<<<<< HEAD
         assert (Class.lower() == 'generator'), 'PvControllerGen works only with an OpenDSS Generator element'
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__Name = 'pyCont_' + Class + '_' + Name
         if '_' in Name:
             self.Phase = Name.split('_')[1]
@@ -234,6 +240,7 @@ def Update(self, Priority, Time, Update):
         #     Error = self.update[Priority]()
         if Priority == 2:
             uIn = self.__UpdateViolatonTimers()
+<<<<<<< HEAD
             self.VoltageRideThrough(uIn)
 
         return Error
@@ -246,6 +253,13 @@ def Trip(self, uIn):
     def VoltageRideThrough(self, uIn):
         """ Implementation of the IEEE1587-2018 voltage ride-through requirements for inverter systems
         """
+=======
+            self.__VoltageRideThrough(uIn)
+
+        return Error
+
+    def __VoltageRideThrough(self, uIn):
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.__faultCounterClearingTimeSec = 1
 
         Pm = Point(self.__uViolationtime, uIn)
diff --git a/PyDSS/pyControllers/Controllers/StorageController.py b/PyDSS/pyControllers/Controllers/StorageController.py
index a40797a2..a9901b7a 100644
--- a/PyDSS/pyControllers/Controllers/StorageController.py
+++ b/PyDSS/pyControllers/Controllers/StorageController.py
@@ -4,6 +4,7 @@
 import ast
 
 class StorageController(ControllerAbstract):
+<<<<<<< HEAD
     """Numerous control implementation for a storage system from both behind-the-meter and front-of- meter applications. Subclass of the :class:`PyDSS.pyControllers.pyControllerAbstract.ControllerAbstract` abstract class.
 
             :param StorageObj: A :class:`PyDSS.dssElement.dssElement` object that wraps around an OpenDSS Storage element
@@ -19,6 +20,8 @@ class StorageController(ControllerAbstract):
             :raises: AssertionError if 'StorageObj' is not a wrapped OpenDSS Storage element
 
     """
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
     def __init__(self, StorageObj, Settings, dssInstance, ElmObjectList, dssSolver):
         self.Time = -1
         super(StorageController).__init__()
@@ -149,8 +152,11 @@ def TimeOfUse(self):
 
 
     def DemandCharge(self):
+<<<<<<< HEAD
         """ Implementation of a demand charge controller for behind the meter applications
         """
+=======
+>>>>>>> 98cba91204224c1b5c9e477759bf012e2f70a369
         self.Demand = 0
         dP = 0
         DemandChgThreh = self.__Settings['DemandChgThreh[kWh]']
diff --git a/Readme.md b/Readme.md
new file mode 100644
index 00000000..f7641b60
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,49 @@
+# Welcome to the PyDSS Repository!
+
+**PyDSS** is a high level python interface for **OpenDSS** and provides the following functionalities
+
+**1] Object oriented programming -** OpenDSS is a text based simulation environment. To improve upon the usability of the Python interface, PyDSS wraps each element (PD elements, PC elements, Bus and Circuits) as a object in python. Each of these objects have functions that facilitate 
+
+**2]	Dynamic visualization -** PyDSS uses **Bokeh** to render dynamic plots during simulation runs. The current version includes six plots. These include
+	
+	 - time series plots
+	 - XY plots
+	 - Voltage distance plots
+	 - Topology plots
+	 - GIS overlay plots
+	 - Histograms
+**3]	Custom controls -**  The main idea behind PyDSS was to come up with a modular approach for adding custom controls to model real systems. New controllers can be added to PyDSS using very little effort. The tool uses outer loop iteration to converge to a steady state solution.
+ 
+**4]	Simulation parallelization -** PyDSS also facilitates simulating multiple scenarios in parallel thus reducing total computation time
+ 
+**5]	Exporting results -**  The tool provides multiple options for exporting simulation results. These include options like exporting as a single file or separate files, exporting by element or by class etc.
+ 
+**6]	Improved Error logging -**  The tool uses a custom logger that can be used to efficiently debug errors 
+
+
+# Installations requirements
+
+The code has been test using Python 3.6+ and requires installation of a number of additional libraries. The code uses 'OpenDSSdirect.py' to interface with OpenDSS. documantation for the library can be found at https://github.com/NREL/OpenDSSDirect.py. The library can be installed using the following command
+
+ **-pip install 'OpenDSSDirect.py[extras]'**
+
+The code has been tested using Bokeh version 0.12.5 and can be installed using
+
+ **-pip install bokeh==0.12.5**
+ 
+
+Additionally, GIS overlay maps require installation of PyProj and a Google maps API key. Google maps API key can be generated at https://developers.google.com/maps/documentation/embed/get-api-key. PyProj is a coordinate transformation package and can be installed using the following command
+
+ **-pip install pyproj**
+ 
+ 
+ All other requirements can be satisfied by installing a Python package like **Anaconda**.
+
+# Bokeh rendering bug fix
+
+Some users have experinced PyDSS halting when Bokeh visulation is used. In all cases tornado and bokeh compatability has been the culprit (until now). The following steps have been able to fix the problem
+	
+	 - pip uninstall bokeh
+	 - pip uninstall tornado
+	 - conda install tornado==4.5.3
+	 - conda install bokeh==0.12.5
\ No newline at end of file
diff --git a/build/lib/Export/Logs/__init__.py b/build/lib/Export/Logs/__init__.py
new file mode 100644
index 00000000..0a5a2957
--- /dev/null
+++ b/build/lib/Export/Logs/__init__.py
@@ -0,0 +1 @@
+from . import pyController
diff --git a/build/lib/Export/__init__.py b/build/lib/Export/__init__.py
new file mode 100644
index 00000000..0a5a2957
--- /dev/null
+++ b/build/lib/Export/__init__.py
@@ -0,0 +1 @@
+from . import pyController
diff --git a/build/lib/PyDSS/MonteCarlo.py b/build/lib/PyDSS/MonteCarlo.py
new file mode 100644
index 00000000..5ff22fff
--- /dev/null
+++ b/build/lib/PyDSS/MonteCarlo.py
@@ -0,0 +1,61 @@
+from ast import literal_eval
+from scipy import stats
+import pandas as pd
+import numpy as np
+import logging
+
+
+class MonteCarloSim:
+
+    def __init__(self, dss, run_command, SimulationSettings, dssPaths, dssObjects, dssObjectsByClass, dssSolver):
+        LoggerTag = SimulationSettings['Active Project'] + '_' + SimulationSettings['Active Scenario']
+        self.pyLogger = logging.getLogger(LoggerTag)
+        self.__dssInstance = dss
+        self.__dssPaths = dssPaths
+        self.__dssSolver = dssSolver
+        self.__dssObjects = dssObjects
+        self.__dssCommand = run_command
+        self.__Settings = SimulationSettings
+        self.__dssObjectsByClass = dssObjectsByClass
+
+        try:
+            MCfile = self.__Settings['Active Scenario'] + '\\MonteCarloSettings\\MonteCarloSettings.xlsx'
+            MCfilePath = self.__dssPaths['Import'] + '\\' + MCfile
+            self.pyLogger.info('Reading monte carlo scenario settings file from ' + MCfilePath)
+            MCsettings = pd.read_excel(MCfilePath,sheetname=0).T
+            self.__MCsettingsDict = MCsettings.to_dict()
+        except:
+            self.pyLogger.warning('Monte Carlo scenario generation file not found')
+            return
+        return
+
+    def Create_Scenario(self):
+        for key, Properties in self.__MCsettingsDict.items():
+            if Properties['Class'] in self.__dssObjectsByClass:
+                Elements = self.__dssObjectsByClass[Properties['Class']]
+                ElmNames = list(Elements.keys())
+                if Properties['useWildCard']:
+                    ElmNames = [x for x in ElmNames if Properties['Wildcard'] in x]
+                NumElms = len(ElmNames)
+                distParams = literal_eval(Properties['Parameters'])
+
+                dist = getattr(stats, Properties['Distribution'].replace(' ', ''))
+                if not Properties['isList']:
+                    MCsamples = dist.rvs(*distParams, size=NumElms)
+                    if Properties['isInteger']:
+                        MCsamples = [int(round(x)) for x in MCsamples]
+                    for ElmName, Value in zip(ElmNames,MCsamples):
+                        Elements[ElmName].SetParameter(Properties['Property'], Value)
+                else:
+                    MCsamples = dist.rvs(*distParams, size=NumElms * Properties['ListLength'])
+                    if Properties['isInteger']:
+                        MCsamples = [int(round(x)) for x in MCsamples]
+                    MCsamples = np.reshape(MCsamples, (NumElms, Properties['ListLength']))
+                    for ElmName, Value in zip(ElmNames, MCsamples):
+                        Value = str(Value).replace('\n', '').replace('\r', '').replace('[ ', '[').replace(' ]', ']')
+                        Elements[ElmName].SetParameter(Properties['Property'], Value)
+            else:
+                self.pyLogger.warning(Properties['Class'] + ' class not present in object dictionary.')
+        return
+
+
diff --git a/build/lib/PyDSS/NetworkModifier.py b/build/lib/PyDSS/NetworkModifier.py
new file mode 100644
index 00000000..6a242d1a
--- /dev/null
+++ b/build/lib/PyDSS/NetworkModifier.py
@@ -0,0 +1,75 @@
+import PyDSS.dssElement as dE
+import logging
+
+
+class Modifier():
+
+    PV_defaultDict = {'phases':'1', 'kV':'2.2',  'irradiance':'1', 'Temperature':'30',
+                      'daily':'m3pvmult', '%cutin':'0.0', '%cutout':'0.0'}
+
+    Storge_defaultDict = {'bus' : 'storagebus', 'kV':'0.48', 'kWRated' : '2000', '%IdlingkW' : '3' ,
+                          'phases':'3', '%EffCharge': '100', 'kWhRated'  : '2000', '%reserve': '0',
+                          '%EffDischarge': '100', 'state': 'IDLE', '%stored' : '50'}
+
+    DefaultDictSelector ={
+        'PVSystem' : PV_defaultDict,
+        'Storage'  : Storge_defaultDict,
+     }
+
+    def __init__(self, dss, run_command, SimulationSettings):
+        LoggerTag = SimulationSettings['Active Project'] + '_' + SimulationSettings['Active Scenario']
+        self.pyLogger = logging.getLogger(LoggerTag)
+        self.__dssInstance = dss
+        self.__dssCircuit = dss.Circuit
+        self.__dssElement = dss.Element
+        self.__dssBus = dss.Bus
+        self.__dssClass = dss.ActiveClass
+        self.__dssCommand = run_command
+
+    def Add_Elements(self, Class, Properties, Add2dssObjects = False, dssObjects = None):
+        DefaultDict  =  self.DefaultDictSelector[Class]
+        ElmNames = []
+        Values = []
+
+        for key, ValueList in Properties.items():
+            ElmNames.append(key)
+            Values.append(ValueList)
+
+        for i in range(len(Values[0])):
+            ElementName= Properties['bus'][i]
+            ElementName = ElementName if '.' not in ElementName else ElementName.replace('.','_')
+            for j in range(len(Values)):
+                DefaultDict[ElmNames[j]] = Values[j][i]
+            Obj = self.Add_Element(Class, ElementName, DefaultDict)
+            if Add2dssObjects is True:
+                dssObjects[Class + '.' + ElementName] = Obj
+
+    def Add_Element(self, Class, Name, Properties):
+        Cmd = 'New ' + Class + '.' + Name
+        for PptyName, PptyVal in Properties.items():
+            if PptyVal is not None:
+                tCMD = ' ' + PptyName + '=' + PptyVal
+                Cmd += tCMD
+        self.pyLogger.info('Added -> ' + Cmd)
+        self.__dssCommand(Cmd)
+        return dE.dssElement(self.__dssInstance)
+
+    def Edit_Element(self, Class, Name, Properties):
+        Cmd = 'Edit ' + Class + '.' + Name
+        for PptyName, PptyVal in Properties.items():
+            if PptyVal is not None:
+                tCMD = ' ' + PptyName + '=' + PptyVal
+                Cmd += tCMD
+        self.__dssCommand(Cmd)
+        self.pyLogger.info('Edited -> ' + Cmd)
+        return
+
+    def Edit_Elements(self, Class, Property=None, Value=None):
+        self.__dssInstance.Circuit.SetActiveClass(Class)
+        Element = self.__dssInstance.ActiveClass.First()
+        while Element:
+            ElmName = self.__dssInstance.ActiveClass.Name()
+            self.__dssInstance.utils.run_command(Class + '.' + ElmName + '.' + Property + ' = ' + str(Value))
+            Element = self.__dssInstance.ActiveClass.Next()
+
+
diff --git a/build/lib/PyDSS/ResultContainer.py b/build/lib/PyDSS/ResultContainer.py
new file mode 100644
index 00000000..acbde849
--- /dev/null
+++ b/build/lib/PyDSS/ResultContainer.py
@@ -0,0 +1,180 @@
+from PyDSS.pyContrReader import pyContrReader as PCR
+import numpy as np
+import pathlib
+import logging
+import os
+
+
+class ResultContainer:
+    def __init__(self, Options, SystemPaths, dssObjects, dssObjectsByClass, dssBuses):
+        LoggerTag = Options['Active Project'] + '_' + Options['Active Scenario']
+        self.Results = {}
+        self.CurrentResults = {}
+        self.pyLogger = logging.getLogger(LoggerTag)
+        self.Buses = dssBuses
+        self.ObjectsByElement = dssObjects
+        self.ObjectsByClass = dssObjectsByClass
+        self.SystemPaths = SystemPaths
+        self.__Settings = Options
+        self.__StartDay = Options['Start Day']
+        self.__EndDay = Options['End Day']
+
+        self.FileReader = PCR(SystemPaths['ExportLists'])
+
+        self.ExportFolder = os.path.join(self.SystemPaths['Export'], Options['Active Scenario'])
+
+        pathlib.Path(self.ExportFolder).mkdir(parents=True, exist_ok=True)
+
+        if self.__Settings['Export Mode'] == 'byElement':
+            self.ExportList = self.FileReader.pyControllers['ExportMode-byElement']
+            self.CreateListByElement()
+        elif self.__Settings['Export Mode'] == 'byClass':
+            self.ExportList = self.FileReader.pyControllers['ExportMode-byClass']
+            self.CreateListByClass()
+        return
+
+    def CreateListByClass(self):
+        for Class , Properties in self.ExportList.items():
+            if Class == 'Buses':
+                self.Results[Class] = {}
+                self.CurrentResults[Class] = {}
+                for PptyIndex, PptyName in Properties.items():
+                    if isinstance(PptyName, str):
+                        self.Results[Class][PptyName] = {}
+                        self.CurrentResults[Class][PptyName] = {}
+                        for BusName, BusObj in self.Buses.items():
+                            if self.Buses[BusName].inVariableDict(PptyName):
+                                self.Results[Class][PptyName][BusName] = []
+                                self.CurrentResults[Class][PptyName][BusName] = None
+            else:
+                if Class in self.ObjectsByClass:
+                    self.Results[Class] = {}
+                    self.CurrentResults[Class] = {}
+                    for PptyIndex, PptyName in Properties.items():
+                        if isinstance(PptyName, str):
+                            self.Results[Class][PptyName] = {}
+                            self.CurrentResults[Class][PptyName] = {}
+                            for ElementName, ElmObj in self.ObjectsByClass[Class].items():
+                                if self.ObjectsByClass[Class][ElementName].IsValidAttribute(PptyName):
+                                    self.Results[Class][PptyName][ElementName] = []
+                                    self.CurrentResults[Class][PptyName][ElementName] = None
+        return
+
+    def CreateListByElement(self):
+        for Element, Properties in self.ExportList.items():
+            if Element in self.ObjectsByElement:
+                self.Results[Element] = {}
+                self.CurrentResults[Element] = {}
+                for PptyIndex, PptyName in Properties.items():
+                    if isinstance(PptyName, str):
+                        if self.ObjectsByElement[Element].IsValidAttribute(PptyName):
+                            self.Results[Element][PptyName] = []
+                            self.CurrentResults[Element][PptyName] = None
+            elif Element in self.Buses:
+                self.Results[Element] = {}
+                self.CurrentResults[Element] = {}
+                for PptyIndex, PptyName in Properties.items():
+                    if isinstance(PptyName, str):
+                        if self.Buses[Element].inVariableDict(PptyName):
+                            self.Results[Element][PptyName] = []
+                            self.CurrentResults[Element][PptyName] = None
+        return
+
+    def UpdateResults(self):
+        if self.__Settings['Export Mode'] == 'byElement':
+            for Element in self.Results.keys():
+                for Property in self.Results[Element].keys():
+                    if '.' in Element:
+                        self.Results[Element][Property].append(self.ObjectsByElement[Element].GetValue(Property))
+                        self.CurrentResults[Element][Property] = self.ObjectsByElement[Element].GetValue(Property)
+                    else:
+                        self.Results[Element][Property].append(self.Buses[Element].GetVariable(Property))
+                        self.CurrentResults[Element][Property] = self.Buses[Element].GetVariable(Property)
+        elif self.__Settings['Export Mode'] == 'byClass':
+            for Class in self.Results.keys():
+                for Property in self.Results[Class].keys():
+                    for Element in self.Results[Class][Property].keys():
+                        if Class == 'Buses':
+                            self.Results[Class][Property][Element].append(self.Buses[Element].GetVariable(Property))
+                            self.CurrentResults[Class][Property][Element] = self.Buses[Element].GetVariable(Property)
+                        else:
+                            self.Results[Class][Property][Element].append(
+                                self.ObjectsByClass[Class][Element].GetValue(Property))
+                            self.CurrentResults[Class][Property][Element] = \
+                                self.ObjectsByClass[Class][Element].GetValue(Property)
+        return
+
+    def ExportResults(self):
+        if self.__Settings['Export Mode'] == 'byElement':
+            self.__ExportResultsByElements()
+        elif self.__Settings['Export Mode'] == 'byClass':
+            self.__ExportResultsByClass()
+
+    def __ExportResultsByClass(self):
+        for Class in self.Results.keys():
+            for Property in self.Results[Class].keys():
+                Class_ElementDatasets = []
+                PptyLvlHeader = ''
+                for Element in self.Results[Class][Property].keys():
+                    ElmLvlHeader = ''
+                    if isinstance(self.Results[Class][Property][Element][0], list):
+                        Data = np.array(self.Results[Class][Property][Element])
+                        for i in range(len(self.Results[Class][Property][Element][0])):
+                            ElmLvlHeader += Element + '-' + str(i) + ','
+                    else:
+                        Data = np.transpose(np.array([self.Results[Class][Property][Element]]))
+                        ElmLvlHeader = Element + ','
+
+                    if self.__Settings['Export Style'] == 'Separate files':
+                        fname = '-'.join([Class, Property, Element, str(self.__StartDay), str(self.__EndDay)]) + '.csv'
+                        np.savetxt(os.path.join(self.ExportFolder, fname), Data,
+                                   delimiter=',', header=ElmLvlHeader, comments='', fmt='%f')
+                        self.pyLogger.info(Class + '-' + Property  + '-' + Element + ".csv exported to " + self.ExportFolder)
+                    elif self.__Settings['Export Style'] == 'Single file':
+                        Class_ElementDatasets.append(Data)
+                    PptyLvlHeader += ElmLvlHeader
+                if self.__Settings['Export Style'] == 'Single file':
+                    Dataset = Class_ElementDatasets[0]
+                    if len(Class_ElementDatasets) > 0:
+                        for D in Class_ElementDatasets[1:]:
+                            Dataset = np.append(Dataset, D, axis=1)
+                    fname = '-'.join([Class, Property, str(self.__StartDay), str(self.__EndDay)]) + '.csv'
+                    np.savetxt(os.path.join(self.ExportFolder, fname), Dataset,
+                               delimiter=',', header=PptyLvlHeader, comments='', fmt='%f')
+                    self.pyLogger.info(Class + '-' + Property + ".csv exported to " + self.ExportFolder)
+        return
+
+    def __ExportResultsByElements(self):
+        for Element in self.Results.keys():
+            ElementDatasets = []
+            AllHeader = ''
+
+            for Property in self.Results[Element].keys():
+                Header = ''
+
+                if isinstance(self.Results[Element][Property][0], list):
+                    Data = np.array(self.Results[Element][Property])
+                    for i in range(len(self.Results[Element][Property][0])):
+                        Header += Property + '-' + str(i) + ','
+                else:
+                    Data = np.transpose(np.array([self.Results[Element][Property]]))
+                    Header = Property + ','
+
+                if self.__Settings['Export Style'] == 'Separate files':
+                    fname = '-'.join([Element, Property, str(self.__StartDay), str(self.__EndDay)]) + '.csv'
+                    np.savetxt(os.path.join(self.ExportFolder, fname), Data,
+                               delimiter=',', header=Header, comments='', fmt='%f')
+                    self.pyLogger.info(Element + '-' + Property + ".csv exported to " + self.ExportFolder)
+                elif self.__Settings['Export Style'] == 'Single file':
+                    ElementDatasets.append(Data)
+                AllHeader += Header
+            if self.__Settings['Export Style'] == 'Single file':
+                Dataset = ElementDatasets[0]
+                if len(ElementDatasets) > 0:
+                    for D in ElementDatasets[1:]:
+                        Dataset = np.append(Dataset, D, axis=1)
+                fname = '-'.join([Element, str(self.__StartDay), str(self.__EndDay)]) + '.csv'
+                np.savetxt(os.path.join(self.ExportFolder, fname), Dataset,
+                           delimiter=',', header=AllHeader, comments='', fmt='%f')
+                self.pyLogger.info(Element + ".csv exported to " + self.ExportFolder)
+        return
diff --git a/build/lib/PyDSS/SolveMode.py b/build/lib/PyDSS/SolveMode.py
new file mode 100644
index 00000000..f7073c1a
--- /dev/null
+++ b/build/lib/PyDSS/SolveMode.py
@@ -0,0 +1,74 @@
+import logging
+
+def GetSolver(SimulationSettings ,dssInstance):
+    LoggerTag = SimulationSettings['Active Project'] + '_' + SimulationSettings['Active Scenario']
+    pyLogger = logging.getLogger(LoggerTag)
+    SolverDict = {
+        'Snapshot': __Shapshot(dssInstance=dssInstance, SimulationSettings=SimulationSettings, Logger=pyLogger),
+        'Daily': __Daily(dssInstance=dssInstance, SimulationSettings=SimulationSettings, Logger=pyLogger),
+    }
+    try:
+        Solver = SolverDict[SimulationSettings['Simulation Type']]
+        pyLogger.info('Solver set to ' + SimulationSettings['Simulation Type'] + ' mode.')
+        return Solver
+    except:
+        pyLogger.error('Incorrect simulation type passed to the function.')
+        return -1
+
+class __Daily:
+    def __init__(self, dssInstance, SimulationSettings, Logger):
+        self.pyLogger = Logger
+        StartDay = SimulationSettings['Start Day']
+        mStepResolution = SimulationSettings['Step resolution (min)']
+        self.mStepRes = mStepResolution
+        self.__dssIntance = dssInstance
+        self.__dssSolution = dssInstance.Solution
+        self.__dssSolution.Mode(2)
+        self.__dssSolution.Hour(StartDay * 24)
+        self.__dssSolution.Number(1)
+        self.__dssSolution.StepSize(self.mStepRes*60)
+        self.__dssSolution.MaxControlIterations(200)
+        return
+
+    def SolveFor(self, mStartTime, mTimeStep):
+        Hour = int(mStartTime/60)
+        Min = mStartTime%60
+        self.__dssSolution.Hour(Hour)
+        self.__dssSolution.Seconds(Min*60)
+        self.__dssSolution.Number(mTimeStep)
+        self.__dssSolution.Solve()
+        return
+
+    def IncStep(self):
+        self.__dssSolution.StepSize(self.mStepRes*60)
+        self.__dssSolution.Solve()
+        self.pyLogger.info('Simululation time [h] - ' + str(self.__dssSolution.DblHour()))
+
+    def reSolve(self):
+        self.__dssSolution.StepSize(0)
+        self.__dssSolution.SolveNoControl()
+
+    def customControlLoop(self):
+        return
+
+class __Shapshot:
+    def __init__(self, dssInstance, SimulationSettings, Logger):
+        self.__dssInstance = dssInstance
+        self.__dssSolution = dssInstance.Solution
+        self.__dssSolution.Mode(0)
+        self.__dssSolution.MaxControlIterations(100)
+        self.OriginalStep = self.__dssSolution.Number()
+        return
+
+    def IncStep(self, CurrentTimeStep):
+        self.timestep = CurrentTimeStep
+        self.__dssSolution.Number(self.number)
+        self.__dssSolution.Hour(CurrentTimeStep)
+        self.__dssSolution.Seconds(0)
+
+    def reSolve(self):
+        self.__dssSolution.StepSizeMin(0)
+        self.__dssSolution.StepSize(0)
+        self.__dssSolution.SolveNoControl()
+
+
diff --git a/build/lib/PyDSS/__init__.py b/build/lib/PyDSS/__init__.py
new file mode 100644
index 00000000..b34dcd4a
--- /dev/null
+++ b/build/lib/PyDSS/__init__.py
@@ -0,0 +1,3 @@
+__version__ = "0.0.1"
+
+from . import *
diff --git a/build/lib/PyDSS/dssBus.py b/build/lib/PyDSS/dssBus.py
new file mode 100644
index 00000000..990bd3e6
--- /dev/null
+++ b/build/lib/PyDSS/dssBus.py
@@ -0,0 +1,70 @@
+class dssBus:
+    __Name = None
+    __Index = None
+    __Variables = {}
+    XY = None
+    def __init__(self, dssInstance):
+        self.__Name =  dssInstance.Bus.Name()
+
+        self.__dssInstance = dssInstance
+        self.Distance = dssInstance.Bus.Distance()
+        BusVarDict = dssInstance.Bus.__dict__
+        for key in BusVarDict.keys():
+            try:
+                self.__Variables[key] = getattr(dssInstance.Bus, key)
+            except:
+                self.__Variables[key] = None
+                pass
+        if self.GetVariable('X') is not None:
+            self.XY = [self.GetVariable('X'),self.GetVariable('Y')]
+        else:
+            self.XY = [0, 0]
+        return
+
+    def GetInfo(self):
+        return self.__Name
+
+    def inVariableDict(self,VarName):
+        if VarName in self.__Variables:
+            return True
+        else:
+            return False
+
+    def DataLength(self,VarName):
+        self.__dssInstance.Circuit.SetActiveBus(self.__Name)
+        VarValue = self.GetVariable(VarName)
+        if  isinstance(VarValue, list):
+            return len(VarValue) , 'List'
+        elif isinstance(VarValue, str):
+            return 1, 'String'
+        elif isinstance(VarValue, int or float or bool):
+            return 1, 'Number'
+        else:
+            return None,None
+
+    def GetVariableNames(self):
+        return self.__Variables.keys()
+
+    def GetVariable(self,VarName):
+        self.__dssInstance.Circuit.SetActiveBus(self.__Name)
+        if VarName in self.__Variables:
+            try:
+                return self.__Variables[VarName]()
+            except:
+                print ('Unexpected error')
+                return None
+        else:
+            print ('Invalid variable name')
+            return None
+
+    def SetVariable(self,VarName,Value):
+        self.__dssInstance.Circuit.SetActiveBus(self.__Name)
+        if VarName in self.__Variables:
+            try:
+                return self.__Variables[VarName](Value)
+            except:
+                print ('Error setting Value')
+                return None
+        else:
+            print ('Invalid variable name')
+            return None
\ No newline at end of file
diff --git a/build/lib/PyDSS/dssCircuit.py b/build/lib/PyDSS/dssCircuit.py
new file mode 100644
index 00000000..9f2bdf59
--- /dev/null
+++ b/build/lib/PyDSS/dssCircuit.py
@@ -0,0 +1,67 @@
+from PyDSS.dssBus import dssBus
+
+class dssCircuit:
+    __Name = None
+    __Variables = {}
+
+    def __init__(self, dssInstance):
+
+        self.__Name =  dssInstance.Circuit.Name()
+        self.__dssInstance = dssInstance
+
+        CktElmVarDict = dssInstance.Circuit.__dict__
+        for key in CktElmVarDict.keys():
+            try:
+                self.__Variables[key] = getattr(dssInstance.Circuit, key)
+            except:
+                self.__Variables[key] = None
+                pass
+        return
+
+    def GetInfo(self):
+        return self.__Name
+
+    def inVariableDict(self,VarName):
+        if VarName in self.__Variables:
+            return True
+        else:
+            return False
+
+    def DataLength(self,VarName):
+        if VarName in self.__Variables:
+            VarValue = self.GetVariable(VarName)
+        else:
+            return 0, None
+        if  isinstance(VarValue, list):
+            return len(VarValue) , 'List'
+        elif isinstance(VarValue, str):
+            return 1, 'String'
+        elif isinstance(VarValue, int or float or bool):
+            return 1, 'Number'
+        else:
+            return 0, None
+
+    def IsValidAttribute(self,VarName):
+        if VarName in self.__Variables:
+            return True
+        else:
+            return False
+
+    def GetValue(self,VarName):
+        if VarName in self.__Variables:
+            VarValue = self.GetVariable(VarName)
+        else:
+            VarValue = -1
+        return VarValue
+
+    def GetVariable(self,VarName):
+        if VarName in self.__Variables:
+            try:
+                return self.__Variables[VarName]()
+            except:
+                print ('Unexpected error')
+                return None
+        else:
+            print (VarName + ' is an invalid variable name for element ' + self.__Name)
+            return None
+
diff --git a/build/lib/PyDSS/dssElement.py b/build/lib/PyDSS/dssElement.py
new file mode 100644
index 00000000..64264c2a
--- /dev/null
+++ b/build/lib/PyDSS/dssElement.py
@@ -0,0 +1,137 @@
+from PyDSS.dssBus import dssBus
+
+class dssElement:
+    __Name = None
+    __Class = None
+    __Parameters = {}
+    __Variables = {}
+    Bus = None
+    BusCount = None
+    sBus = []
+    def __init__(self, dssInstance):
+
+
+        self.__Class,  self.__Name =  dssInstance.Element.Name().split('.',1)
+        self.__dssInstance = dssInstance
+
+        PropertiesNames = self.__dssInstance.Element.AllPropertyNames()
+        AS = range(len(PropertiesNames))
+        for i, PptName in zip(AS, PropertiesNames):
+            self.__Parameters[PptName] = str(i)
+
+        if dssInstance.CktElement.Name() == dssInstance.Element.Name():
+            CktElmVarDict = dssInstance.CktElement.__dict__
+            for VarName in dssInstance.CktElement.AllVariableNames():
+                CktElmVarDict[VarName] = None
+
+            for key in CktElmVarDict.keys():
+                try:
+                    self.__Variables[key] = getattr(dssInstance.CktElement, key)
+                except:
+                    self.__Variables[key] = None
+                    pass
+            self.Bus = dssInstance.CktElement.BusNames()
+            self.BusCount = len(self.Bus)
+            self.sBus = []
+            for BusName in self.Bus:
+                self.__dssInstance.Circuit.SetActiveBus(BusName)
+                self.sBus.append(dssBus(self.__dssInstance))
+            return
+
+
+    def GetInfo(self):
+        return self.__Class,  self.__Name
+
+    def inVariableDict(self,VarName):
+        if VarName in self.__Variables:
+            return True
+        else:
+            return False
+
+    def DataLength(self,VarName):
+        if VarName in self.__Variables:
+            VarValue = self.GetVariable(VarName)
+        elif VarName in self.__Parameters:
+            VarValue = self.GetParameter(VarName)
+        else:
+            return 0, None
+
+        if  isinstance(VarValue, list):
+            return len(VarValue) , 'List'
+        elif isinstance(VarValue, str):
+            return 1, 'String'
+        elif isinstance(VarValue, int or float or bool):
+            return 1, 'Number'
+        else:
+            return 0, None
+
+    def GetValue(self,VarName):
+        if VarName in self.__Variables:
+            VarValue = self.GetVariable(VarName)
+        elif VarName in self.__Parameters:
+            VarValue = self.GetParameter(VarName)
+            if VarValue is not None:
+                VarValue = float(VarValue)
+            else:
+                VarValue = 0
+        else:
+            VarValue = 0
+        return VarValue
+
+    def IsValidAttribute(self,VarName):
+        if VarName in self.__Variables:
+            return True
+        elif VarName in self.__Parameters:
+            return True
+        else:
+            return False
+
+
+    def GetVariable(self,VarName):
+        self.__dssInstance.Circuit.SetActiveElement(self.__Class + '.' + self.__Name)
+        if self.__dssInstance.CktElement.Name() == self.__dssInstance.Element.Name():
+            if VarName in self.__Variables:
+                try:
+                    return self.__Variables[VarName]()
+                except:
+                    print ('Unexpected error')
+                    return None
+            else:
+                print (VarName + ' is an invalid variable name for element ' + self.__Class + '.' + self.__Name)
+                return None
+        else:
+            print ('Object is not a circuit element')
+            return None
+
+    def SetParameter(self, Param, Value):
+        self.__dssInstance.utils.run_command(self.__Class + '.' + self.__Name + '.' + Param + ' = ' + str(Value))
+        return self.GetParameter(Param)
+
+
+    def GetParameter(self, Param):
+        self.__dssInstance.Circuit.SetActiveElement(self.__Class + '.' + self.__Name)
+        if self.__dssInstance.Element.Name() == (self.__Class + '.' + self.__Name):
+            NumberOfProperties = len(self.__dssInstance.Element.AllPropertyNames())
+            for i in range(NumberOfProperties):
+                PropertyName = self.__dssInstance.Properties.Name(str(i))
+                if PropertyName.lower()== Param.lower():
+                    X =self.__dssInstance.Properties.Value(str(i))
+                    #print(self.__Class + '.' + self.__Name + '.' + Param + ' -> ' + str(X))
+                    return X
+            print(Param + ' ia an invalid parameter for ' + self.__Class + ' class.')
+            return None
+        else:
+            print('Could not set ' + self.__Class + '.' + self.__Name + ' as active element.')
+            return None
+
+    def GetParameter(self, Param):
+        self.__dssInstance.Circuit.SetActiveElement(self.__Class + '.' + self.__Name)
+        if Param in self.__Parameters:
+            try:
+                return self.__dssInstance.Properties.Value(self.__Parameters[Param])
+            except:
+                print ('Unable to get the passed parameter (check function documentation).')
+                return None
+        else:
+            print ('Invalid parameter for ' + self.__Class + ' class.')
+            return None
\ No newline at end of file
diff --git a/build/lib/PyDSS/dssGUI-old.py b/build/lib/PyDSS/dssGUI-old.py
new file mode 100644
index 00000000..19c1ab8c
--- /dev/null
+++ b/build/lib/PyDSS/dssGUI-old.py
@@ -0,0 +1,443 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'dssGUI.ui'
+#
+# Created by: PyQt5 UI code generator 5.10
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtWebEngineWidgets
+from PyQt5.QtCore import QUrl, QEventLoop
+
+class Ui_PyDSS(object):
+    def setupUi(self, PyDSS):
+        PyDSS.setObjectName("PyDSS")
+        PyDSS.setWindowModality(QtCore.Qt.ApplicationModal)
+        PyDSS.resize(1102, 624)
+        font = QtGui.QFont()
+        font.setFamily("Times New Roman")
+        PyDSS.setFont(font)
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap("html/PyDSS.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        PyDSS.setWindowIcon(icon)
+        PyDSS.setWindowOpacity(4.0)
+        self.tabWidget = QtWidgets.QTabWidget(PyDSS)
+        self.tabWidget.setEnabled(True)
+        self.tabWidget.setGeometry(QtCore.QRect(10, 10, 1081, 601))
+        font = QtGui.QFont()
+        font.setFamily("Times New Roman")
+        self.tabWidget.setFont(font)
+        self.tabWidget.setObjectName("tabWidget")
+        self.tab = QtWidgets.QWidget()
+        self.tab.setObjectName("tab")
+        self.label_7 = QtWidgets.QLabel(self.tab)
+        self.label_7.setGeometry(QtCore.QRect(8, 10, 191, 21))
+        self.label_7.setObjectName("label_7")
+        self.treeView_ProjectBrowser = QtWidgets.QTreeView(self.tab)
+        self.treeView_ProjectBrowser.setGeometry(QtCore.QRect(10, 40, 256, 231))
+        self.treeView_ProjectBrowser.setObjectName("treeView_ProjectBrowser")
+        self.groupBox = QtWidgets.QGroupBox(self.tab)
+        self.groupBox.setGeometry(QtCore.QRect(280, 30, 381, 241))
+        self.groupBox.setObjectName("groupBox")
+        self.label_8 = QtWidgets.QLabel(self.groupBox)
+        self.label_8.setGeometry(QtCore.QRect(20, 30, 191, 21))
+        self.label_8.setObjectName("label_8")
+        self.label_9 = QtWidgets.QLabel(self.groupBox)
+        self.label_9.setGeometry(QtCore.QRect(20, 65, 191, 21))
+        self.label_9.setObjectName("label_9")
+        self.label_10 = QtWidgets.QLabel(self.groupBox)
+        self.label_10.setGeometry(QtCore.QRect(20, 100, 191, 21))
+        self.label_10.setObjectName("label_10")
+        self.label_11 = QtWidgets.QLabel(self.groupBox)
+        self.label_11.setGeometry(QtCore.QRect(20, 200, 191, 21))
+        self.label_11.setObjectName("label_11")
+        self.label_12 = QtWidgets.QLabel(self.groupBox)
+        self.label_12.setGeometry(QtCore.QRect(20, 134, 191, 21))
+        self.label_12.setObjectName("label_12")
+        self.spinBox_StartDay = QtWidgets.QSpinBox(self.groupBox)
+        self.spinBox_StartDay.setGeometry(QtCore.QRect(100, 30, 261, 23))
+        self.spinBox_StartDay.setMaximum(10000)
+        self.spinBox_StartDay.setObjectName("spinBox_StartDay")
+        self.spinBox_EndDay = QtWidgets.QSpinBox(self.groupBox)
+        self.spinBox_EndDay.setGeometry(QtCore.QRect(100, 65, 261, 23))
+        self.spinBox_EndDay.setMaximum(10000)
+        self.spinBox_EndDay.setProperty("value", 1)
+        self.spinBox_EndDay.setObjectName("spinBox_EndDay")
+        self.spinBox_TimeStep = QtWidgets.QSpinBox(self.groupBox)
+        self.spinBox_TimeStep.setGeometry(QtCore.QRect(140, 100, 221, 23))
+        self.spinBox_TimeStep.setProperty("value", 15)
+        self.spinBox_TimeStep.setObjectName("spinBox_TimeStep")
+        self.comboBox_SimType = QtWidgets.QComboBox(self.groupBox)
+        self.comboBox_SimType.setGeometry(QtCore.QRect(140, 134, 221, 23))
+        self.comboBox_SimType.setEditable(False)
+        self.comboBox_SimType.setMinimumContentsLength(2)
+        self.comboBox_SimType.setObjectName("comboBox_SimType")
+        self.comboBox_SimType.addItem("")
+        self.comboBox_SimType.addItem("")
+        self.comboBox_SimType.addItem("")
+        self.comboBox_SimType.addItem("")
+        self.spinBox_MaxItr = QtWidgets.QSpinBox(self.groupBox)
+        self.spinBox_MaxItr.setGeometry(QtCore.QRect(200, 200, 161, 23))
+        self.spinBox_MaxItr.setProperty("value", 10)
+        self.spinBox_MaxItr.setObjectName("spinBox_MaxItr")
+        self.label_15 = QtWidgets.QLabel(self.groupBox)
+        self.label_15.setGeometry(QtCore.QRect(20, 170, 191, 21))
+        self.label_15.setObjectName("label_15")
+        self.doubleSpinBox = QtWidgets.QDoubleSpinBox(self.groupBox)
+        self.doubleSpinBox.setGeometry(QtCore.QRect(171, 169, 191, 23))
+        self.doubleSpinBox.setMaximum(10000.0)
+        self.doubleSpinBox.setProperty("value", 1.0)
+        self.doubleSpinBox.setObjectName("doubleSpinBox")
+        self.groupBox_2 = QtWidgets.QGroupBox(self.tab)
+        self.groupBox_2.setGeometry(QtCore.QRect(680, 29, 381, 201))
+        self.groupBox_2.setObjectName("groupBox_2")
+        self.label_14 = QtWidgets.QLabel(self.groupBox_2)
+        self.label_14.setGeometry(QtCore.QRect(20, 40, 191, 21))
+        self.label_14.setObjectName("label_14")
+        self.label_ = QtWidgets.QLabel(self.groupBox_2)
+        self.label_.setGeometry(QtCore.QRect(20, 160, 191, 21))
+        self.label_.setObjectName("label_")
+        self.label_LogExtFile = QtWidgets.QLabel(self.groupBox_2)
+        self.label_LogExtFile.setGeometry(QtCore.QRect(20, 80, 191, 21))
+        self.label_LogExtFile.setObjectName("label_LogExtFile")
+        self.label_LogScreen = QtWidgets.QLabel(self.groupBox_2)
+        self.label_LogScreen.setGeometry(QtCore.QRect(20, 120, 191, 21))
+        self.label_LogScreen.setObjectName("label_LogScreen")
+        self.comboBox_LogLvl = QtWidgets.QComboBox(self.groupBox_2)
+        self.comboBox_LogLvl.setGeometry(QtCore.QRect(150, 40, 211, 23))
+        self.comboBox_LogLvl.setObjectName("comboBox_LogLvl")
+        self.comboBox_LogLvl.addItem("")
+        self.comboBox_LogLvl.addItem("")
+        self.comboBox_LogLvl.addItem("")
+        self.comboBox_LogExtFile = QtWidgets.QComboBox(self.groupBox_2)
+        self.comboBox_LogExtFile.setGeometry(QtCore.QRect(150, 78, 211, 23))
+        self.comboBox_LogExtFile.setObjectName("comboBox_LogExtFile")
+        self.comboBox_LogExtFile.addItem("")
+        self.comboBox_LogExtFile.addItem("")
+        self.comboBox_DelLog = QtWidgets.QComboBox(self.groupBox_2)
+        self.comboBox_DelLog.setGeometry(QtCore.QRect(150, 158, 211, 23))
+        self.comboBox_DelLog.setObjectName("comboBox_DelLog")
+        self.comboBox_DelLog.addItem("")
+        self.comboBox_DelLog.addItem("")
+        self.comboBox_LogScreen = QtWidgets.QComboBox(self.groupBox_2)
+        self.comboBox_LogScreen.setGeometry(QtCore.QRect(150, 120, 211, 23))
+        self.comboBox_LogScreen.setObjectName("comboBox_LogScreen")
+        self.comboBox_LogScreen.addItem("")
+        self.comboBox_LogScreen.addItem("")
+        self.groupBox_3 = QtWidgets.QGroupBox(self.tab)
+        self.groupBox_3.setGeometry(QtCore.QRect(280, 281, 381, 121))
+        self.groupBox_3.setObjectName("groupBox_3")
+        self.checkBox_NetworkLayout = QtWidgets.QCheckBox(self.groupBox_3)
+        self.checkBox_NetworkLayout.setGeometry(QtCore.QRect(20, 30, 181, 21))
+        self.checkBox_NetworkLayout.setObjectName("checkBox_NetworkLayout")
+        self.checkBox_XY = QtWidgets.QCheckBox(self.groupBox_3)
+        self.checkBox_XY.setGeometry(QtCore.QRect(20, 90, 181, 21))
+        self.checkBox_XY.setObjectName("checkBox_XY")
+        self.checkBox_TimeSeries = QtWidgets.QCheckBox(self.groupBox_3)
+        self.checkBox_TimeSeries.setGeometry(QtCore.QRect(20, 60, 181, 21))
+        self.checkBox_TimeSeries.setObjectName("checkBox_TimeSeries")
+        self.checkBox_Histogram = QtWidgets.QCheckBox(self.groupBox_3)
+        self.checkBox_Histogram.setGeometry(QtCore.QRect(210, 60, 181, 21))
+        self.checkBox_Histogram.setObjectName("checkBox_Histogram")
+        self.checkBox_GIS = QtWidgets.QCheckBox(self.groupBox_3)
+        self.checkBox_GIS.setGeometry(QtCore.QRect(210, 90, 181, 21))
+        self.checkBox_GIS.setObjectName("checkBox_GIS")
+        self.checkBox_VD = QtWidgets.QCheckBox(self.groupBox_3)
+        self.checkBox_VD.setGeometry(QtCore.QRect(210, 30, 181, 21))
+        self.checkBox_VD.setObjectName("checkBox_VD")
+        self.groupBox_4 = QtWidgets.QGroupBox(self.tab)
+        self.groupBox_4.setGeometry(QtCore.QRect(680, 240, 381, 151))
+        self.groupBox_4.setFlat(False)
+        self.groupBox_4.setObjectName("groupBox_4")
+        self.label_18 = QtWidgets.QLabel(self.groupBox_4)
+        self.label_18.setGeometry(QtCore.QRect(20, 32, 191, 21))
+        self.label_18.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.label_18.setObjectName("label_18")
+        self.label_19 = QtWidgets.QLabel(self.groupBox_4)
+        self.label_19.setGeometry(QtCore.QRect(20, 108, 191, 21))
+        self.label_19.setObjectName("label_19")
+        self.label_20 = QtWidgets.QLabel(self.groupBox_4)
+        self.label_20.setGeometry(QtCore.QRect(20, 71, 191, 21))
+        self.label_20.setObjectName("label_20")
+        self.comboBox_ExportMode = QtWidgets.QComboBox(self.groupBox_4)
+        self.comboBox_ExportMode.setGeometry(QtCore.QRect(150, 68, 211, 23))
+        self.comboBox_ExportMode.setObjectName("comboBox_ExportMode")
+        self.comboBox_ExportMode.addItem("")
+        self.comboBox_ExportMode.addItem("")
+        self.comboBox_ExportResults = QtWidgets.QComboBox(self.groupBox_4)
+        self.comboBox_ExportResults.setGeometry(QtCore.QRect(150, 30, 211, 23))
+        self.comboBox_ExportResults.setObjectName("comboBox_ExportResults")
+        self.comboBox_ExportResults.addItem("")
+        self.comboBox_ExportResults.addItem("")
+        self.comboBox_ExportStyle = QtWidgets.QComboBox(self.groupBox_4)
+        self.comboBox_ExportStyle.setGeometry(QtCore.QRect(150, 106, 211, 23))
+        self.comboBox_ExportStyle.setObjectName("comboBox_ExportStyle")
+        self.comboBox_ExportStyle.addItem("")
+        self.comboBox_ExportStyle.addItem("")
+        self.label_13 = QtWidgets.QLabel(self.tab)
+        self.label_13.setGeometry(QtCore.QRect(10, 280, 191, 21))
+        self.label_13.setObjectName("label_13")
+        self.listWidget_opendssfiles = QtWidgets.QListWidget(self.tab)
+        self.listWidget_opendssfiles.setGeometry(QtCore.QRect(10, 310, 256, 161))
+        self.listWidget_opendssfiles.setObjectName("listWidget_opendssfiles")
+        self.groupBox_5 = QtWidgets.QGroupBox(self.tab)
+        self.groupBox_5.setEnabled(False)
+        self.groupBox_5.setGeometry(QtCore.QRect(680, 400, 381, 161))
+        self.groupBox_5.setFlat(False)
+        self.groupBox_5.setObjectName("groupBox_5")
+        self.groupBox_6 = QtWidgets.QGroupBox(self.tab)
+        self.groupBox_6.setEnabled(False)
+        self.groupBox_6.setGeometry(QtCore.QRect(280, 410, 381, 151))
+        self.groupBox_6.setFlat(False)
+        self.groupBox_6.setObjectName("groupBox_6")
+        self.pushButton_RunSimulation = QtWidgets.QPushButton(self.tab)
+        self.pushButton_RunSimulation.setGeometry(QtCore.QRect(10, 490, 121, 28))
+        self.pushButton_RunSimulation.setObjectName("pushButton_RunSimulation")
+        self.pushButton_Exit = QtWidgets.QPushButton(self.tab)
+        self.pushButton_Exit.setGeometry(QtCore.QRect(144, 530, 121, 28))
+        self.pushButton_Exit.setObjectName("pushButton_Exit")
+        self.pushButton_CreateProject = QtWidgets.QPushButton(self.tab)
+        self.pushButton_CreateProject.setGeometry(QtCore.QRect(144, 490, 121, 28))
+        self.pushButton_CreateProject.setObjectName("pushButton_CreateProject")
+        self.pushButton_StopSimulation = QtWidgets.QPushButton(self.tab)
+        self.pushButton_StopSimulation.setGeometry(QtCore.QRect(10, 530, 121, 28))
+        self.pushButton_StopSimulation.setObjectName("pushButton_StopSimulation")
+        self.tabWidget.addTab(self.tab, "")
+        self.tab_2 = QtWidgets.QWidget()
+        self.tab_2.setObjectName("tab_2")
+        self.label_5 = QtWidgets.QLabel(self.tab_2)
+        self.label_5.setGeometry(QtCore.QRect(210, 10, 191, 21))
+        self.label_5.setObjectName("label_5")
+        self.tableWidget_CtrlTable = QtWidgets.QTableWidget(self.tab_2)
+        self.tableWidget_CtrlTable.setGeometry(QtCore.QRect(210, 40, 851, 521))
+        self.tableWidget_CtrlTable.setObjectName("tableWidget_CtrlTable")
+        self.tableWidget_CtrlTable.setColumnCount(0)
+        self.tableWidget_CtrlTable.setRowCount(0)
+        self.label_6 = QtWidgets.QLabel(self.tab_2)
+        self.label_6.setGeometry(QtCore.QRect(8, 10, 191, 21))
+        self.label_6.setObjectName("label_6")
+        self.pushButton_CtrlDel = QtWidgets.QPushButton(self.tab_2)
+        self.pushButton_CtrlDel.setGeometry(QtCore.QRect(9, 490, 91, 31))
+        self.pushButton_CtrlDel.setObjectName("pushButton_CtrlDel")
+        self.pushButton_CtrlAddRow = QtWidgets.QPushButton(self.tab_2)
+        self.pushButton_CtrlAddRow.setGeometry(QtCore.QRect(9, 530, 91, 31))
+        self.pushButton_CtrlAddRow.setObjectName("pushButton_CtrlAddRow")
+        self.listWidget_CtrlFiles = QtWidgets.QListWidget(self.tab_2)
+        self.listWidget_CtrlFiles.setGeometry(QtCore.QRect(9, 41, 191, 431))
+        self.listWidget_CtrlFiles.setObjectName("listWidget_CtrlFiles")
+        self.pushButton_CtrlDel_2 = QtWidgets.QPushButton(self.tab_2)
+        self.pushButton_CtrlDel_2.setGeometry(QtCore.QRect(110, 490, 91, 31))
+        self.pushButton_CtrlDel_2.setObjectName("pushButton_CtrlDel_2")
+        self.pushButton_CtrlAddCol = QtWidgets.QPushButton(self.tab_2)
+        self.pushButton_CtrlAddCol.setGeometry(QtCore.QRect(110, 530, 91, 31))
+        self.pushButton_CtrlAddCol.setObjectName("pushButton_CtrlAddCol")
+        self.tabWidget.addTab(self.tab_2, "")
+        self.tab_3 = QtWidgets.QWidget()
+        self.tab_3.setObjectName("tab_3")
+        self.listWidget_PltFiles = QtWidgets.QListWidget(self.tab_3)
+        self.listWidget_PltFiles.setGeometry(QtCore.QRect(10, 40, 191, 431))
+        self.listWidget_PltFiles.setObjectName("listWidget_PltFiles")
+        self.label_3 = QtWidgets.QLabel(self.tab_3)
+        self.label_3.setGeometry(QtCore.QRect(210, 10, 191, 21))
+        self.label_3.setObjectName("label_3")
+        self.tableWidget_PltTable = QtWidgets.QTableWidget(self.tab_3)
+        self.tableWidget_PltTable.setGeometry(QtCore.QRect(210, 40, 851, 521))
+        self.tableWidget_PltTable.setObjectName("tableWidget_PltTable")
+        self.tableWidget_PltTable.setColumnCount(0)
+        self.tableWidget_PltTable.setRowCount(0)
+        self.label_4 = QtWidgets.QLabel(self.tab_3)
+        self.label_4.setGeometry(QtCore.QRect(8, 10, 191, 21))
+        self.label_4.setObjectName("label_4")
+        self.pushButton_pltdel = QtWidgets.QPushButton(self.tab_3)
+        self.pushButton_pltdel.setGeometry(QtCore.QRect(10, 490, 91, 31))
+        self.pushButton_pltdel.setObjectName("pushButton_pltdel")
+        self.pushButton_PltAddRow = QtWidgets.QPushButton(self.tab_3)
+        self.pushButton_PltAddRow.setGeometry(QtCore.QRect(10, 530, 91, 31))
+        self.pushButton_PltAddRow.setObjectName("pushButton_PltAddRow")
+        self.pushButton_PltAddCol = QtWidgets.QPushButton(self.tab_3)
+        self.pushButton_PltAddCol.setGeometry(QtCore.QRect(110, 530, 91, 31))
+        self.pushButton_PltAddCol.setObjectName("pushButton_PltAddCol")
+        self.pushButton_pltdel_2 = QtWidgets.QPushButton(self.tab_3)
+        self.pushButton_pltdel_2.setGeometry(QtCore.QRect(110, 490, 91, 31))
+        self.pushButton_pltdel_2.setObjectName("pushButton_pltdel_2")
+        self.tabWidget.addTab(self.tab_3, "")
+        self.tab_4 = QtWidgets.QWidget()
+        self.tab_4.setObjectName("tab_4")
+        self.tableWidget_ExpTable = QtWidgets.QTableWidget(self.tab_4)
+        self.tableWidget_ExpTable.setGeometry(QtCore.QRect(210, 40, 851, 521))
+        self.tableWidget_ExpTable.setObjectName("tableWidget_ExpTable")
+        self.tableWidget_ExpTable.setColumnCount(0)
+        self.tableWidget_ExpTable.setRowCount(0)
+        self.label = QtWidgets.QLabel(self.tab_4)
+        self.label.setGeometry(QtCore.QRect(8, 10, 191, 21))
+        self.label.setObjectName("label")
+        self.label_2 = QtWidgets.QLabel(self.tab_4)
+        self.label_2.setGeometry(QtCore.QRect(210, 10, 191, 21))
+        self.label_2.setObjectName("label_2")
+        self.pushButton_ExpDel = QtWidgets.QPushButton(self.tab_4)
+        self.pushButton_ExpDel.setGeometry(QtCore.QRect(10, 490, 91, 31))
+        self.pushButton_ExpDel.setObjectName("pushButton_ExpDel")
+        self.pushButton_ExpAddRow = QtWidgets.QPushButton(self.tab_4)
+        self.pushButton_ExpAddRow.setGeometry(QtCore.QRect(10, 530, 91, 31))
+        self.pushButton_ExpAddRow.setObjectName("pushButton_ExpAddRow")
+        self.listWidget_ExpFiles = QtWidgets.QListWidget(self.tab_4)
+        self.listWidget_ExpFiles.setGeometry(QtCore.QRect(10, 40, 191, 431))
+        self.listWidget_ExpFiles.setObjectName("listWidget_ExpFiles")
+        self.pushButton_ExpAddCol = QtWidgets.QPushButton(self.tab_4)
+        self.pushButton_ExpAddCol.setGeometry(QtCore.QRect(110, 530, 91, 31))
+        self.pushButton_ExpAddCol.setObjectName("pushButton_ExpAddCol")
+        self.pushButton_ExpDel_2 = QtWidgets.QPushButton(self.tab_4)
+        self.pushButton_ExpDel_2.setGeometry(QtCore.QRect(110, 490, 91, 31))
+        self.pushButton_ExpDel_2.setObjectName("pushButton_ExpDel_2")
+        self.tabWidget.addTab(self.tab_4, "")
+        self.tab_7 = QtWidgets.QWidget()
+        self.tab_7.setObjectName("tab_7")
+        self.treeView_PythonFiles = QtWidgets.QTreeView(self.tab_7)
+        self.treeView_PythonFiles.setGeometry(QtCore.QRect(10, 40, 201, 431))
+        self.treeView_PythonFiles.setObjectName("treeView_PythonFiles")
+        self.pushButton_DelPython = QtWidgets.QPushButton(self.tab_7)
+        self.pushButton_DelPython.setGeometry(QtCore.QRect(10, 530, 201, 31))
+        self.pushButton_DelPython.setObjectName("pushButton_DelPython")
+        self.pushButton_PythonEdit = QtWidgets.QPushButton(self.tab_7)
+        self.pushButton_PythonEdit.setGeometry(QtCore.QRect(10, 490, 201, 31))
+        self.pushButton_PythonEdit.setObjectName("pushButton_PythonEdit")
+        self.textEdit_Python = QtWidgets.QTextEdit(self.tab_7)
+        self.textEdit_Python.setGeometry(QtCore.QRect(220, 40, 841, 521))
+        self.textEdit_Python.setObjectName("textEdit_Python")
+        self.label_21 = QtWidgets.QLabel(self.tab_7)
+        self.label_21.setGeometry(QtCore.QRect(10, 10, 191, 21))
+        self.label_21.setObjectName("label_21")
+        self.label_22 = QtWidgets.QLabel(self.tab_7)
+        self.label_22.setGeometry(QtCore.QRect(220, 10, 191, 21))
+        self.label_22.setObjectName("label_22")
+        self.tabWidget.addTab(self.tab_7, "")
+        self.tab_6 = QtWidgets.QWidget()
+        self.tab_6.setObjectName("tab_6")
+        self.WebViewer = QtWebEngineWidgets.QWebEngineView(self.tab_6)
+        self.WebViewer.setGeometry(QtCore.QRect(15, 10, 1050, 550))
+        self.WebViewer.setObjectName("WebViewer")
+        self.WebViewer.load(QUrl("http://dpv.epri.com/opendss.html"))
+
+        self.tabWidget.addTab(self.tab_6, "")
+        self.tab_15 = QtWidgets.QWidget()
+        self.tab_15.setObjectName("tab_15")
+        self.treeView_Results = QtWidgets.QTreeView(self.tab_15)
+        self.treeView_Results.setGeometry(QtCore.QRect(10, 40, 261, 231))
+        self.treeView_Results.setObjectName("treeView_Results")
+        self.label_46 = QtWidgets.QLabel(self.tab_15)
+        self.label_46.setGeometry(QtCore.QRect(10, 10, 191, 21))
+        self.label_46.setObjectName("label_46")
+        self.label_47 = QtWidgets.QLabel(self.tab_15)
+        self.label_47.setGeometry(QtCore.QRect(290, 10, 191, 21))
+        self.label_47.setObjectName("label_47")
+        self.label_48 = QtWidgets.QLabel(self.tab_15)
+        self.label_48.setGeometry(QtCore.QRect(10, 280, 191, 21))
+        self.label_48.setObjectName("label_48")
+        self.listWidget_Results = QtWidgets.QListWidget(self.tab_15)
+        self.listWidget_Results.setGeometry(QtCore.QRect(10, 310, 261, 251))
+        self.listWidget_Results.setObjectName("listWidget_Results")
+        self.tabWidget.addTab(self.tab_15, "")
+        self.tab_5 = QtWidgets.QWidget()
+        self.tab_5.setObjectName("tab_5")
+        self.textBrowser_Log = QtWidgets.QTextBrowser(self.tab_5)
+        self.textBrowser_Log.setGeometry(QtCore.QRect(10, 41, 1051, 521))
+        self.textBrowser_Log.setObjectName("textBrowser_Log")
+        self.label_16 = QtWidgets.QLabel(self.tab_5)
+        self.label_16.setGeometry(QtCore.QRect(10, 10, 191, 21))
+        self.label_16.setObjectName("label_16")
+        self.tabWidget.addTab(self.tab_5, "")
+
+        self.retranslateUi(PyDSS)
+        self.tabWidget.setCurrentIndex(0)
+        QtCore.QMetaObject.connectSlotsByName(PyDSS)
+
+    def retranslateUi(self, PyDSS):
+        _translate = QtCore.QCoreApplication.translate
+        PyDSS.setWindowTitle(_translate("PyDSS", "PyDSS"))
+        self.label_7.setText(_translate("PyDSS", "Project browser"))
+        self.groupBox.setTitle(_translate("PyDSS", "Simulation settings"))
+        self.label_8.setText(_translate("PyDSS", "Start day"))
+        self.label_9.setText(_translate("PyDSS", "End day"))
+        self.label_10.setText(_translate("PyDSS", "Time step (min)"))
+        self.label_11.setText(_translate("PyDSS", "Maximum control iterations"))
+        self.label_12.setText(_translate("PyDSS", "Simulation type"))
+        self.comboBox_SimType.setCurrentText(_translate("PyDSS", "Quasi static time series"))
+        self.comboBox_SimType.setItemText(0, _translate("PyDSS", "Quasi static time series"))
+        self.comboBox_SimType.setItemText(1, _translate("PyDSS", "Snapshot"))
+        self.comboBox_SimType.setItemText(2, _translate("PyDSS", "Monte Carlo"))
+        self.comboBox_SimType.setItemText(3, _translate("PyDSS", "Temporal parallelization"))
+        self.label_15.setText(_translate("PyDSS", "Error tolerance (kVA)"))
+        self.groupBox_2.setTitle(_translate("PyDSS", "Logger settings"))
+        self.label_14.setText(_translate("PyDSS", "Logging level"))
+        self.label_.setText(_translate("PyDSS", "Clear old log files"))
+        self.label_LogExtFile.setText(_translate("PyDSS", "Log to external file"))
+        self.label_LogScreen.setText(_translate("PyDSS", "Display on screen"))
+        self.comboBox_LogLvl.setItemText(0, _translate("PyDSS", "DEBUG"))
+        self.comboBox_LogLvl.setItemText(1, _translate("PyDSS", "WARNING"))
+        self.comboBox_LogLvl.setItemText(2, _translate("PyDSS", "INFO"))
+        self.comboBox_LogExtFile.setItemText(0, _translate("PyDSS", "True"))
+        self.comboBox_LogExtFile.setItemText(1, _translate("PyDSS", "False"))
+        self.comboBox_DelLog.setItemText(0, _translate("PyDSS", "True"))
+        self.comboBox_DelLog.setItemText(1, _translate("PyDSS", "False"))
+        self.comboBox_LogScreen.setItemText(0, _translate("PyDSS", "True"))
+        self.comboBox_LogScreen.setItemText(1, _translate("PyDSS", "False"))
+        self.groupBox_3.setTitle(_translate("PyDSS", "Plot settings"))
+        self.checkBox_NetworkLayout.setText(_translate("PyDSS", "Network layout plot"))
+        self.checkBox_XY.setText(_translate("PyDSS", "XY plot"))
+        self.checkBox_TimeSeries.setText(_translate("PyDSS", "Time series plot"))
+        self.checkBox_Histogram.setText(_translate("PyDSS", "Histogram plot"))
+        self.checkBox_GIS.setText(_translate("PyDSS", "GIS overlay plot"))
+        self.checkBox_VD.setText(_translate("PyDSS", "Voltage / distance plot"))
+        self.groupBox_4.setTitle(_translate("PyDSS", "Export settings"))
+        self.label_18.setText(_translate("PyDSS", "Export results"))
+        self.label_19.setText(_translate("PyDSS", "Export style"))
+        self.label_20.setText(_translate("PyDSS", "Export mode"))
+        self.comboBox_ExportMode.setItemText(0, _translate("PyDSS", "byClass"))
+        self.comboBox_ExportMode.setItemText(1, _translate("PyDSS", "byElement"))
+        self.comboBox_ExportResults.setItemText(0, _translate("PyDSS", "True"))
+        self.comboBox_ExportResults.setItemText(1, _translate("PyDSS", "False"))
+        self.comboBox_ExportStyle.setItemText(0, _translate("PyDSS", "Single file"))
+        self.comboBox_ExportStyle.setItemText(1, _translate("PyDSS", "Separate files"))
+        self.label_13.setText(_translate("PyDSS", "OpenDSS files"))
+        self.groupBox_5.setTitle(_translate("PyDSS", "Temporal parallelization settings"))
+        self.groupBox_6.setTitle(_translate("PyDSS", "Monte Carlo settings"))
+        self.pushButton_RunSimulation.setText(_translate("PyDSS", "Run simulation"))
+        self.pushButton_Exit.setText(_translate("PyDSS", "E&xit"))
+        self.pushButton_CreateProject.setText(_translate("PyDSS", "Create project"))
+        self.pushButton_StopSimulation.setText(_translate("PyDSS", "Stop simulation"))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("PyDSS", "Simulation settings"))
+        self.label_5.setText(_translate("PyDSS", "File dataset"))
+        self.label_6.setText(_translate("PyDSS", "List of controller files"))
+        self.pushButton_CtrlDel.setText(_translate("PyDSS", "Save file"))
+        self.pushButton_CtrlAddRow.setText(_translate("PyDSS", "Add row"))
+        self.pushButton_CtrlDel_2.setText(_translate("PyDSS", "Delete file"))
+        self.pushButton_CtrlAddCol.setText(_translate("PyDSS", "Add column"))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("PyDSS", "Controller settings"))
+        self.label_3.setText(_translate("PyDSS", "File dataset"))
+        self.label_4.setText(_translate("PyDSS", "List of plot files"))
+        self.pushButton_pltdel.setText(_translate("PyDSS", "Save file"))
+        self.pushButton_PltAddRow.setText(_translate("PyDSS", "Add row"))
+        self.pushButton_PltAddCol.setText(_translate("PyDSS", "Add column"))
+        self.pushButton_pltdel_2.setText(_translate("PyDSS", "Delete file"))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("PyDSS", "Plots settings"))
+        self.label.setText(_translate("PyDSS", "List of export files"))
+        self.label_2.setText(_translate("PyDSS", "File dataset"))
+        self.pushButton_ExpDel.setText(_translate("PyDSS", "Save file"))
+        self.pushButton_ExpAddRow.setText(_translate("PyDSS", "Add row"))
+        self.pushButton_ExpAddCol.setText(_translate("PyDSS", "Add column"))
+        self.pushButton_ExpDel_2.setText(_translate("PyDSS", "Delete file"))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("PyDSS", "Export settings"))
+        self.pushButton_DelPython.setText(_translate("PyDSS", "Delete file"))
+        self.pushButton_PythonEdit.setText(_translate("PyDSS", "Save file"))
+        self.label_21.setText(_translate("PyDSS", "List of Python files"))
+        self.label_22.setText(_translate("PyDSS", "File editor"))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_7), _translate("PyDSS", "Code editor"))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_6), _translate("PyDSS", "Plots"))
+        self.label_46.setText(_translate("PyDSS", "List of result files"))
+        self.label_47.setText(_translate("PyDSS", "Plot "))
+        self.label_48.setText(_translate("PyDSS", "Results"))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_15), _translate("PyDSS", "Results"))
+        self.label_16.setText(_translate("PyDSS", "List of export files"))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_5), _translate("PyDSS", "Log"))
+
diff --git a/build/lib/PyDSS/dssGUI.py b/build/lib/PyDSS/dssGUI.py
new file mode 100644
index 00000000..f8036f35
--- /dev/null
+++ b/build/lib/PyDSS/dssGUI.py
@@ -0,0 +1,75 @@
+import logging
+
+
+class __Daily:
+    def __init__(self, dssInstance, SimulationSettings, Logger):
+        self.pyLogger = Logger
+        StartDay = SimulationSettings['Start Day']
+        mStepResolution = SimulationSettings['Step resolution (min)']
+        self.mStepRes = mStepResolution
+        self.__dssIntance = dssInstance
+        self.__dssSolution = dssInstance.Solution
+        self.__dssSolution.Mode(2)
+        self.__dssSolution.Hour(StartDay * 24)
+        self.__dssSolution.Number(1)
+        self.__dssSolution.StepSize(self.mStepRes*60)
+        self.__dssSolution.MaxControlIterations(200)
+        return
+
+    def SolveFor(self, mStartTime, mTimeStep):
+        Hour = int(mStartTime/60)
+        Min = mStartTime%60
+        self.__dssSolution.Hour(Hour)
+        self.__dssSolution.Seconds(Min*60)
+        self.__dssSolution.Number(mTimeStep)
+        self.__dssSolution.Solve()
+        return
+
+    def IncStep(self):
+        self.__dssSolution.StepSize(self.mStepRes*60)
+        self.__dssSolution.Solve()
+        self.pyLogger.info('Simulation time [h] - ' + str(self.__dssSolution.DblHour()))
+
+    def reSolve(self):
+        self.__dssSolution.StepSize(0)
+        self.__dssSolution.SolveNoControl()
+
+    def customControlLoop(self):
+        return
+
+
+class __Shapshot:
+    def __init__(self, dssInstance, SimulationSettings, Logger):
+        self.__dssInstance = dssInstance
+        self.__dssSolution = dssInstance.Solution
+        self.__dssSolution.Mode(0)
+        self.__dssSolution.MaxControlIterations(100)
+        self.OriginalStep = self.__dssSolution.Number()
+        return
+
+    def IncStep(self, CurrentTimeStep):
+        self.timestep = CurrentTimeStep
+        self.__dssSolution.Number(self.number)
+        self.__dssSolution.Hour(CurrentTimeStep)
+        self.__dssSolution.Seconds(0)
+
+    def reSolve(self):
+        self.__dssSolution.StepSizeMin(0)
+        self.__dssSolution.StepSize(0)
+        self.__dssSolution.SolveNoControl()
+
+
+def GetSolver(SimulationSettings ,dssInstance):
+    LoggerTag = SimulationSettings['Active Project'] + '_' + SimulationSettings['Active Scenario']
+    pyLogger = logging.getLogger(LoggerTag)
+    SolverDict = {
+        'Snapshot': __Shapshot(dssInstance=dssInstance, SimulationSettings=SimulationSettings, Logger=pyLogger),
+        'Daily': __Daily(dssInstance=dssInstance, SimulationSettings=SimulationSettings, Logger=pyLogger),
+    }
+    try:
+        Solver = SolverDict[SimulationSettings['Simulation Type']]
+        pyLogger.info('Solver set to ' + SimulationSettings['Simulation Type'] + ' mode.')
+        return Solver
+    except:
+        pyLogger.error('Incorrect simulation type passed to the function.')
+        return -1
diff --git a/build/lib/PyDSS/dssInstance.py b/build/lib/PyDSS/dssInstance.py
new file mode 100644
index 00000000..01784564
--- /dev/null
+++ b/build/lib/PyDSS/dssInstance.py
@@ -0,0 +1,283 @@
+from PyDSS.ResultContainer import ResultContainer as RC
+from PyDSS.pyContrReader import pyContrReader as pcr
+from PyDSS.pyPlotReader import pyPlotReader as ppr
+from PyDSS.dssElement import dssElement
+from PyDSS.dssCircuit import dssCircuit
+from PyDSS.NetworkModifier import Modifier
+from PyDSS.dssBus import dssBus
+from PyDSS import SolveMode
+from PyDSS import pyLogger
+import pyControllers
+import PyPlots
+
+from opendssdirect.utils import run_command
+import opendssdirect as dss
+import time
+import logging
+import os
+
+CONTROLLER_PRIORITIES = 3
+
+DSS_DEFAULTS = {
+    # Logging Defaults
+    'Logging Level': logging.INFO,
+    'Log to external file': True,
+    'Display on screen': True,
+    'Clear old log files': False,
+
+    # Simulation Options
+    'Start Day': 0,
+    'End Day': 1,
+    'Step resolution (min)': 15,
+    'Max Control Iterations': 10,
+	'Project Path'   : r'C:\Users\alatif\Desktop\PyDSS-Projects',
+    'Simulation Type': 'Daily',
+    'Active Project': 'Mikilua',
+    'Active Scenario': 'None-None',
+    'DSS File': 'MasterCircuit_Mikilua_baseline2.dss',
+    'Error tolerance': 1,
+
+    # Results Options
+    'Log Results': True,
+    'Export Mode': 'byClass',
+    'Export Style': 'Single file',
+
+    # Plot Options
+    'Network layout': False,
+    'Time series': False,
+    'XY plot': False,
+    'Sag plot': False,
+    'Histogram': False,
+    'GIS overlay': False,
+}
+
+
+class OpenDSS:
+    __TempResultList = []
+    __dssInstance = dss
+    __dssBuses = {}
+    __dssObjects = {}
+    __dssObjectsByClass = {}
+    __DelFlag = 0
+    __pyPlotObjects = {}
+    BokehSessionID = None
+
+    def __init__(self, **kwargs):
+        DSS_DEFAULTS.update(kwargs)
+        kwargs = DSS_DEFAULTS
+        rootPath = kwargs['Project Path']
+        importPath = os.path.join(rootPath, kwargs['Active Project'], 'PyDSS Scenarios')
+        self.__dssPath = {
+            'root': rootPath,
+            'Import': importPath,
+            'pyPlots': os.path.join(importPath, kwargs['Active Scenario'], 'pyPlotList'),
+            'ExportLists': os.path.join(importPath, kwargs['Active Scenario'], 'ExportLists'),
+            'pyControllers': os.path.join(importPath, kwargs['Active Scenario'], 'pyControllerList'),
+            'Export': os.path.join(rootPath, kwargs['Active Project'], 'Exports'),
+            'Log': os.path.join(rootPath, kwargs['Active Project'], 'Logs'),
+            'dssFiles': os.path.join(rootPath, kwargs['Active Project'], 'DSSfiles'),
+        }
+
+        LoggerTag = kwargs['Active Project'] + '_' + kwargs['Active Scenario']
+        self.__Logger = pyLogger.getLogger(LoggerTag, self.__dssPath['Log'], LoggerOptions=kwargs)
+        self.__Logger.info('An instance of OpenDSS version ' + dss.__version__ + ' has been created.')
+
+        self.__Options = kwargs
+        self.__dssFilePath = os.path.join(self.__dssPath['dssFiles'], kwargs['DSS File'])
+
+        self.__dssInstance.Basic.ClearAll()
+        self.__dssInstance.utils.run_command('Log=NO')
+        run_command('Clear')
+        run_command('compile ' + self.__dssFilePath)
+
+        self.__dssCircuit = dss.Circuit
+        self.__dssElement = dss.Element
+        self.__dssBus = dss.Bus
+        self.__dssClass = dss.ActiveClass
+        self.__dssCommand = run_command
+        self.__dssSolution = dss.Solution
+        self.__dssSolver = SolveMode.GetSolver(SimulationSettings=kwargs, dssInstance=self.__dssInstance)
+
+        self.__Modifier = Modifier(dss, run_command, self.__Options)
+        #self.__ModifyNetwork()
+        self.__UpdateDictionary()
+
+        self.__CreateBusObjects()
+        self.__dssSolver.reSolve()
+
+        if self.__Options and self.__Options['Log Results']:
+            self.ResultContainer = RC(kwargs, self.__dssPath,
+                                      self.__dssObjects, self.__dssObjectsByClass, self.__dssBuses, self.__dssSolver)
+
+        pyCtrlReader = pcr(self.__dssPath['pyControllers'])
+        ControllerList = pyCtrlReader.pyControllers
+        if ControllerList is not None:
+            self.__CreateControllers(ControllerList)
+
+
+        pyPlotReader = ppr(self.__dssPath['pyPlots'])
+        PlotList = pyPlotReader.pyPlots
+        if PlotList is not None and not all(value == False for value in kwargs.values()):
+            self.__CreatePlots(PlotList)
+
+        for Plot in self.__pyPlotObjects:
+            self.BokehSessionID = self.__pyPlotObjects[Plot].GetSessionID()
+            if kwargs['Open plots in browser']:
+                self.__pyPlotObjects[Plot].session.show()
+            break
+
+        return
+
+    def __ModifyNetwork(self):
+        # self.__Modifier.Add_Elements('Storage', {'bus' : ['storagebus'], 'kWRated' : ['2000'], 'kWhRated'  : ['2000']},
+        #                              True, self.__dssObjects)
+        # self.__Modifier.Edit_Elements('regcontrol', 'enabled' ,'False')
+        #self.__Modifier.Edit_Elements('Load', 'enabled', 'False')
+        return
+
+    def __CreateControllers(self, ControllerDict):
+        self.__pyControls = {}
+
+        for ControllerType, ElementsDict in ControllerDict.items():
+            for ElmName, SettingsDict in ElementsDict.items():
+                 Controller = pyControllers.pyController.Create(ElmName, ControllerType, SettingsDict, self.__dssObjects,
+                                                  self.__dssInstance, self.__dssSolver)
+                 if Controller != -1:
+                    self.__pyControls['Controller.' + ElmName] = Controller
+                    self.__Logger.info('Created pyController -> Controller.' + ElmName)
+        return
+
+    def __CreatePlots(self, PlotsDict):
+        for PlotType, PlotNames in PlotsDict.items():
+            newPlotNames = list(PlotNames)
+            PlotType1= ['Network layout', 'GIS overlay']
+            PlotType2 = ['Sag plot', 'Histogram']
+            PlotType3 = ['XY plot', 'Time series']
+            for Name in newPlotNames:
+                PlotSettings = PlotNames[Name]
+                PlotSettings['FileName'] = Name
+                if PlotType in PlotType1 and self.__Options[PlotType]:
+                    self.__pyPlotObjects[PlotType] = PyPlots.pyPlots.Create(PlotType, PlotSettings,self.__dssBuses,
+                                                                    self.__dssObjectsByClass,self.__dssCircuit)
+                    self.__Logger.info('Created pyPlot -> ' + PlotType)
+                elif PlotType in PlotType2 and self.__Options[PlotType]:
+                    self.__pyPlotObjects[PlotType + Name] = PyPlots.pyPlots.Create(PlotType, PlotSettings,self.__dssBuses,
+                                                                           self.__dssObjectsByClass, self.__dssCircuit)
+                    self.__Logger.info('Created pyPlot -> ' + PlotType)
+                elif PlotType in PlotType3  and self.__Options[PlotType]:
+                    self.__pyPlotObjects[PlotType+Name] = PyPlots.pyPlots.Create(PlotType, PlotSettings,self.__dssBuses,
+                                                                         self.__dssObjects, self.__dssCircuit)
+                    self.__Logger.info('Created pyPlot -> ' + PlotType)
+        return
+
+    def __UpdateControllers(self, Priority, Time, UpdateResults):
+        error = 0
+        for controller in self.__pyControls.values():
+            error += controller.Update(Priority, Time, UpdateResults)
+        return abs(error) < self.__Options['Error tolerance'], error
+
+    def __CreateBusObjects(self):
+        BusNames = self.__dssCircuit.AllBusNames()
+        for BusName in BusNames:
+            self.__dssCircuit.SetActiveBus(BusName)
+            self.__dssBuses[BusName] = dssBus(self.__dssInstance)
+        return
+
+    def __UpdateDictionary(self):
+        InvalidSelection = ['Settings', 'ActiveClass', 'dss', 'utils', 'PDElements', 'XYCurves', 'Bus', 'Properties']
+        self.__dssObjectsByClass={'LoadShape' : self.__GetRelaventObjectDict('LoadShape')}
+
+        for ElmName in self.__dssInstance.Circuit.AllElementNames():
+            Class, Name =  ElmName.split('.', 1)
+            if Class + 's' not in self.__dssObjectsByClass:
+                self.__dssObjectsByClass[Class + 's'] = {}
+            self.__dssInstance.Circuit.SetActiveElement(ElmName)
+            self.__dssObjectsByClass[Class + 's'][ElmName] = dssElement(self.__dssInstance)
+            self.__dssObjects[ElmName] = self.__dssObjectsByClass[Class + 's'][ElmName]
+
+        for ObjName in self.__dssObjects.keys():
+            Class = ObjName.split('.')[0] + 's'
+            if Class not in self.__dssObjectsByClass:
+                self.__dssObjectsByClass[Class] = {}
+            if  ObjName not in self.__dssObjectsByClass[Class]:
+                self.__dssObjectsByClass[Class][ObjName] = self.__dssObjects[ObjName]
+
+        self.__dssObjects['Circuit.' + self.__dssCircuit.Name()] = dssCircuit(self.__dssInstance)
+        self.__dssObjectsByClass['Circuits'] = {
+            'Circuit.' + self.__dssCircuit.Name() : self.__dssObjects['Circuit.' + self.__dssCircuit.Name()]
+        }
+        return
+
+    def __GetRelaventObjectDict(self, key):
+        ObjectList = {}
+        ElmCollection = getattr(dss, key)
+        Elem = ElmCollection.First()
+        while Elem:
+            ObjectList[self.__dssInstance.Element.Name()] =  dssElement(self.__dssInstance)
+            Elem = ElmCollection.Next()
+        return ObjectList
+
+    def RunStep(self, step, updateObjects=None):
+        print('Running simulation @ time step: ', step)
+        if updateObjects:
+            for object, params in updateObjects.items():
+                cl, name = object.split('.')
+                self.__Modifier.Edit_Elements(cl, name, params)
+            pass
+
+        self.__dssSolver.IncStep()
+        for priority in range(CONTROLLER_PRIORITIES):
+            for i in range(self.__Options['Max Control Iterations']):
+                has_converged, error = self.__UpdateControllers(priority, step, UpdateResults=False)
+                self.__Logger.debug('Control Loop {} convergence error: {}'.format(priority, error))
+                if has_converged or i == self.__Options['Max Control Iterations'] - 1:
+                    if not has_converged:
+                        self.__Logger.warning('Control Loop {} no convergence @ {} '.format(priority, step))
+                    break
+                self.__dssSolver.reSolve()
+            #self.__dssSolver.reSolve()
+
+        self.__UpdatePlots()
+        if self.__Options['Log Results']:
+            self.ResultContainer.UpdateResults()
+        if self.__Options['Return Results']:
+            return self.ResultContainer.CurrentResults
+        #self.__dssSolver.IncStep()
+
+    def RunSimulation(self):
+        startTime = time.time()
+        TotalDays = self.__Options['End Day'] - self.__Options['Start Day']
+        Steps = int(TotalDays * 24 * 60 / self.__Options['Step resolution (min)'])
+        self.__Logger.info('Running simulation for ' + str(Steps) + ' time steps')
+        for step in range(Steps):
+            self.RunStep(step)
+
+        if self.__Options and self.__Options['Log Results']:
+            self.ResultContainer.ExportResults()
+
+        self.__Logger.info('Simulation completed in ' + str(time.time() - startTime) + ' seconds')
+        self.__Logger.info('End of simulation')
+
+    def __UpdatePlots(self):
+        for Plot in self.__pyPlotObjects:
+            self.__pyPlotObjects[Plot].UpdatePlot()
+        return
+
+    def DeleteInstance(self):
+        self.__DelFlag = 1
+        self.__del__()
+        return
+
+    def __del__(self):
+
+        x = list(self.__Logger.handlers)
+        for i in x:
+            self.__Logger.removeHandler(i)
+            i.flush()
+            i.close()
+
+        if self.__DelFlag == 1:
+            self.__Logger.info('An instance of OpenDSS (' + str(self) + ') has been deleted.')
+        else:
+            self.__Logger.error('An instance of OpenDSS (' + str(self) + ') crashed.')
+        return
\ No newline at end of file
diff --git a/build/lib/PyDSS/dssNetworkX.py b/build/lib/PyDSS/dssNetworkX.py
new file mode 100644
index 00000000..25421ab9
--- /dev/null
+++ b/build/lib/PyDSS/dssNetworkX.py
@@ -0,0 +1,307 @@
+import pandas as pd
+import networkx as nx
+from math import sqrt
+
+from bokeh.client import push_session
+from bokeh.io import show, output_file
+from bokeh.plotting import figure
+from bokeh.layouts import  column
+from bokeh.plotting import figure, curdoc
+from bokeh.models import ColumnDataSource, HoverTool, BoxSelectTool, BoxZoomTool, PanTool, WheelZoomTool, ResetTool, SaveTool
+
+import matplotlib.colors as colors
+import opendssdirect as dss
+from opendssdirect.utils import run_command
+import os
+
+class dssNetworkX:
+    #__Name = None
+    #__Class = None
+    def __init__(self, rootPath=os.getcwd(), SimSettings = None):
+        self.__dssInstance = dss
+        dssFiles = rootPath + '\\ProjectFiles\\' + SimSettings['Active Project'] + '\\DSSfiles'
+        self.__dssFilePath = dssFiles + '\\' + SimSettings['DSS File']
+        self.__dssInstance.Basic.ClearAll()
+        self.__dssInstance.utils.run_command('Log=NO')
+        run_command('Clear')
+        run_command('compile ' + self.__dssFilePath)
+        self.__dssGraph = nx.DiGraph()
+
+        self.__CreateNodes()
+        self.__CreatePDEdges()
+        self.__CreatePCEdges()
+        return
+
+    def __CreateUniqueNodePropertyDict(self, Property):
+        i = 0
+        Dict = {}
+        for Node in self.__dssGraph.nodes():
+            if Property in self.__dssGraph.node[Node]:
+                PptyValue = self.__dssGraph.node[Node][Property]
+                if PptyValue not in Dict:
+                    Dict[PptyValue] = i
+                    i += 1
+            else:
+                print(Property + ' is not a valid property for nodes')
+                break
+        return Dict
+
+    def __CreateUniqueLinePropertyDict(self, Property):
+        i = 0
+        Dict = {}
+        for Line in self.__dssGraph.edges():
+            Node1 = list(Line)[0]
+            Node2 = list(Line)[1]
+            if Property in self.__dssGraph[Node1][Node2]:
+                PptyValue = self.__dssGraph[Node1][Node2][Property]
+                if PptyValue not in Dict:
+                    Dict[PptyValue] = i
+                    i += 1
+            else:
+                print(Property + ' is not a valid property for edges')
+                break
+        return Dict
+
+    def GetUniqueEdgeProperties(self):
+        EdgeAttrList = []
+        for Edge in self.__dssGraph.edges():
+            Node1 = list(Edge)[0]
+            Node2 = list(Edge)[1]
+            for Attr in self.__dssGraph[Node1][Node2].keys():
+                if Attr not in EdgeAttrList:
+                    EdgeAttrList.append(Attr)
+        return EdgeAttrList
+
+    def GetUniqueNodeProperties(self):
+        NodeAttrList = []
+        for Node in self.__dssGraph.nodes():
+            for Attr in self.__dssGraph.node[Node].keys():
+                NodeAttrList.append(Attr)
+            break
+        return NodeAttrList
+
+    def CreateGraphVisualization(self, Settings = None):
+        Col1 = 120
+        Col2 = 10
+        Layouts = {
+            'Circular': nx.circular_layout,
+            'Spring': nx.spring_layout,
+            'Fruchterman': nx.fruchterman_reingold_layout,
+            'Spectral': nx.spectral_layout,
+            'Random': nx.random_layout,
+            'Shell': nx.shell_layout,
+        }
+
+        NodeColorProperty = Settings['NodeColorProperty']
+        LineColorProperty = Settings['LineColorProperty']
+        Iterations = Settings['Iterations']
+        Layout = Settings['Layout']
+        ShowRefNode = Settings['ShowRefNode']
+        NodeSize = Settings['NodeSize']
+        OpenBrowser = Settings['Open plots in browser']
+
+        NodeDict = self.__CreateUniqueNodePropertyDict(NodeColorProperty)
+        LineDict = self.__CreateUniqueLinePropertyDict(LineColorProperty)
+        ColorList = list(colors.cnames.keys())
+
+        NodeColor = [ColorList[Col2 + NodeDict[i[1][NodeColorProperty]]] for i in self.__dssGraph.nodes(data=True)]
+        self.__NodeList = list(NodeDict.keys())
+        self.__LineList = list(LineDict.keys())
+        self.__NodeColor = [ColorList[Col2 + x] for x in range(len(self.__NodeList))]
+        self.__LineColor = [ColorList[Col1 + x] for x in range(len(self.__LineList))]
+        try:
+            layout = Layouts[Layout](self.__dssGraph, iterations=Iterations)
+        except:
+            layout = Layouts[Layout](self.__dssGraph)#, k = 1.1/sqrt(self.__dssGraph.number_of_nodes()), iterations= 50)
+        NodeData =  pd.DataFrame([[i[0],
+                                   layout[i[0]][0],
+                                   layout[i[0]][1],
+                                   i[1]['kVBase'],
+                                   i[1]['TotalMiles'],
+                                   i[1]['NumNodes'],
+                                   i[1]['N_Customers'],
+                                   i[1]['Distance'],
+                                   i[1]['ConnectedPDs'],
+                                   i[1]['ConnectedPCs']] for i in self.__dssGraph.nodes(data=True)]
+                                 , columns=['Name',
+                                            'X',
+                                            'Y',
+                                            'kVBase',
+                                            'TotalMiles',
+                                            'NumNodes',
+                                            'N_Customers',
+                                            'Distance',
+                                            'ConnectedPDs',
+                                            'ConnectedPCs',]).set_index('Name')
+        self.DataSource = ColumnDataSource(NodeData)
+        hoverBus = HoverTool(tooltips=[
+            ('Name','@Name'),
+            ("(x,y)", "(@X, @Y)"),
+            ('kVBase','@kVBase'),
+            ('TotalMiles','@TotalMiles'),
+            ('NumNodes','@NumNodes'),
+            ('N_Customers','@N_Customers'),
+            ('Distance','@Distance'),
+            ('Connected PDs', '@ConnectedPDs'),
+            ('Connected PCs', '@ConnectedPCs'),
+        ])
+        Xs = []
+        Ys = []
+        LineColors = []
+
+        for Edge in self.__dssGraph.edges():
+            Node1 = list(Edge)[0]
+            Node2 = list(Edge)[1]
+            if ShowRefNode:
+                Xs.append([NodeData.loc[Node1]['X'], NodeData.loc[Node2]['X']])
+                Ys.append([NodeData.loc[Node1]['Y'], NodeData.loc[Node2]['Y']])
+                LineColors.append(ColorList[Col1 + LineDict[self.__dssGraph[Node1][Node2][LineColorProperty]]])
+            else:
+                if Node2 != 'Ref Ground Node':
+                    Xs.append([NodeData.loc[Node1]['X'], NodeData.loc[Node2]['X']])
+                    Ys.append([NodeData.loc[Node1]['Y'], NodeData.loc[Node2]['Y']])
+                    LineColors.append(ColorList[Col1 + LineDict[self.__dssGraph[Node1][Node2][LineColorProperty]]])
+        plot = figure(tools=[ResetTool(), hoverBus, BoxSelectTool(), SaveTool(),
+                             BoxZoomTool(), WheelZoomTool(), PanTool()],
+                      title="Distribution network graph representation",
+                      plot_width=650,
+                      plot_height=600,
+                      )
+        C = plot.circle('X', 'Y', source=self.DataSource, size=NodeSize, level='overlay', color=NodeColor, legend='Nodes')
+        L = plot.multi_line(Xs, Ys, color=LineColors, legend='Edges')
+        plot.legend.location = "top_left"
+        plot.legend.click_policy = "hide"
+        #output_file("networkx_graph.html")
+        doc = curdoc()
+        doc.add_root(plot)
+        doc.title = "PyDSS"
+        self.__session = push_session(doc)
+        if OpenBrowser:
+            show(plot)
+        return
+
+    def GetColorList(self):
+        A2 = zip(self.__LineList, self.__LineColor)
+        A1 = zip(self.__NodeList, self.__NodeColor)
+        return A1, A2
+
+    def GetSessionID(self):
+        return self.__session.id
+
+    def __CreatePCEdges(self):
+        PCElement = self.__dssInstance.Circuit.FirstPCElement()
+        while PCElement:
+            ElementData = {
+                'Name'             : self.__dssInstance.CktElement.Name().split('.')[1],
+                'Class'            : self.__dssInstance.CktElement.Name().split('.')[0],
+                'BusFrom'          : self.__dssInstance.CktElement.BusNames()[0].split('.')[0],
+                'PhasesFrom'       : self.__dssInstance.CktElement.BusNames()[0].split('.')[1:],
+                'BusTo'            : 'Ref Ground Node',
+            }
+            self.__dssGraph.node[ElementData['BusFrom']]['ConnectedPCs'] += ' ' + ElementData['Class']
+            ElementData = self.__ExtendPCElementDict(ElementData)
+            self.__dssGraph.add_edge(ElementData['BusFrom'], ElementData['BusTo'])
+            self.__dssGraph[ElementData['BusFrom']][ElementData['BusTo']] = ElementData
+            PCElement = self.__dssInstance.Circuit.NextPCElement()
+        return
+
+    def __ExtendPCElementDict(self, Dict):
+        #print(self.__dssInstance.CktElement.AllPropertyNames())
+        NumberOfProperties = len(self.__dssInstance.Element.AllPropertyNames())
+        for i in range(NumberOfProperties):
+            try:
+                PropertyName = self.__dssInstance.Properties.Name(str(i))
+                X = self.__dssInstance.Properties.Value(str(i))
+                if X is not None and X is not '' and PropertyName is not None and PropertyName is not '':
+                    Dict[PropertyName] = X
+            except:
+                pass
+        return Dict
+
+    def __CreatePDEdges(self):
+        PDElement = self.__dssInstance.Circuit.FirstPDElement()
+        while PDElement:
+            ElementData = {
+                'Name'             : self.__dssInstance.CktElement.Name().split('.')[1],
+                'Class'            : self.__dssInstance.CktElement.Name().split('.')[0],
+                'BusFrom'          : self.__dssInstance.CktElement.BusNames()[0].split('.')[0],
+                'PhasesFrom'       : self.__dssInstance.CktElement.BusNames()[0].split('.')[1:],
+                'BusTo'            : self.__dssInstance.CktElement.BusNames()[1].split('.')[0],
+                'PhasesTo'         : self.__dssInstance.CktElement.BusNames()[1].split('.')[1:],
+                'Enabled'          : self.__dssInstance.CktElement.Enabled(),
+                'HasSwitchControl' : self.__dssInstance.CktElement.HasSwitchControl(),
+                'HasVoltControl'   : self.__dssInstance.CktElement.HasVoltControl(),
+                'IsOpen'           : self.__dssInstance.CktElement.IsOpen(),
+                'GUID'             : self.__dssInstance.CktElement.GUID(),
+                'NumConductors'    : self.__dssInstance.CktElement.NumConductors(),
+                'NumControls'      : self.__dssInstance.CktElement.NumControls(),
+                'NumPhases'        : self.__dssInstance.CktElement.NumPhases(),
+                'NumTerminals'     : self.__dssInstance.CktElement.NumTerminals(),
+                'OCPDevType'       : self.__dssInstance.CktElement.NumTerminals(),
+                'IsShunt'          : self.__dssInstance.PDElements.IsShunt(),
+                'NumCustomers'     : self.__dssInstance.PDElements.NumCustomers(),
+                'ParentPDElement'  : self.__dssInstance.PDElements.ParentPDElement(),
+                'SectionID'        : self.__dssInstance.PDElements.SectionID(),
+                'TotalCustomers'   : self.__dssInstance.PDElements.TotalCustomers(),
+                'TotalMiles'       : self.__dssInstance.PDElements.TotalMiles(),
+            }
+            self.__dssGraph.node[ElementData['BusFrom']]['ConnectedPDs'] += ' ' + ElementData['Class']
+            self.__dssGraph.node[ElementData['BusTo']]['ConnectedPDs'] += ' ' + ElementData['Class']
+            self.__dssGraph.add_edge(ElementData['BusFrom'], ElementData['BusTo'])
+            self.__dssGraph[ElementData['BusFrom']][ElementData['BusTo']] = ElementData
+            PDElement = self.__dssInstance.Circuit.NextPDElement()
+        return
+
+    def __CreateNodes(self):
+        Buses = self.__dssInstance.Circuit.AllBusNames()
+        BusData = {}
+        for Bus in Buses:
+            self.__dssInstance.Circuit.SetActiveBus(Bus)
+            BusData = {
+                'Name'          : self.__dssInstance.Bus.Name(),
+                'X'             : self.__dssInstance.Bus.X(),
+                'Y'             : self.__dssInstance.Bus.Y(),
+                'kVBase'        : self.__dssInstance.Bus.kVBase(),
+                'Zsc0'          : self.__dssInstance.Bus.Zsc0(),
+                'Zsc1'          : self.__dssInstance.Bus.Zsc1(),
+                'TotalMiles'    : self.__dssInstance.Bus.TotalMiles(),
+                'SectionID'     : self.__dssInstance.Bus.SectionID(),
+                'Nodes'         : self.__dssInstance.Bus.Nodes(),
+                'NumNodes'      : self.__dssInstance.Bus.NumNodes(),
+                'N_Customers'   : self.__dssInstance.Bus.N_Customers(),
+                'Distance'      : self.__dssInstance.Bus.Distance(),
+                'ConnectedPDs'  : '',
+                'ConnectedPCs'  : '',
+            }
+            self.__dssGraph.add_node(self.__dssInstance.Bus.Name())
+            self.__dssGraph.node[self.__dssInstance.Bus.Name()] = BusData
+        self.__dssGraph.add_node('Ref Ground Node')
+        BusData['X'] = 0
+        BusData['Y'] = 0
+        BusData['kVBase'] = 0
+        BusData['TotalMiles'] = 0
+        BusData['NumNodes'] = 0
+        BusData['N_Customers'] = 0
+        BusData['Distance'] = 0
+        self.__dssGraph.node['Ref Ground Node'] = BusData
+        return
+
+SS = {
+        'Active Project'         : 'HECO',
+        'DSS File'               : 'MasterCircuit_Mikilua_baseline2.dss',
+
+    }
+
+AA = {
+        'Layout'                 : 'Circular',
+        'Iterations'             : 100,
+        'ShowRefNode'            : False,
+        'NodeSize'               : 10,
+        'LineColorProperty'      : 'Class',
+        'NodeColorProperty'      : 'ConnectedPCs',
+        'Open plots in browser'  : True,
+}
+
+# if __name__ == '__main__':
+#     A = dssNetworkX(SimSettings=SS)
+#     A.CreateGraphVisualization(Settings=AA)
\ No newline at end of file
diff --git a/build/lib/PyDSS/pyContrReader.py b/build/lib/PyDSS/pyContrReader.py
new file mode 100644
index 00000000..fd06610c
--- /dev/null
+++ b/build/lib/PyDSS/pyContrReader.py
@@ -0,0 +1,20 @@
+import os
+import pandas as pd
+
+
+class pyContrReader:
+    pyControllers = {}
+    def __init__(self, Path = r'C:/Users/alatif/Desktop/PyDSS-heco/Import/pyControllerList'):
+        self.pyControllers = {}
+        filenames = os.listdir(Path)
+        for filename in filenames:
+            if filename.endswith('.xlsx'):
+                pyControllerType  = filename.split('.')[0]
+                ControllerDataset = pd.read_excel(os.path.join(Path, filename), skiprows=[0,], index_col=[0])
+                pyControllerNames = ControllerDataset.index.tolist()
+                pyController = {}
+                for pyControllerName in pyControllerNames:
+                    pyControllerData = ControllerDataset.loc[pyControllerName]
+                    pyControllerDict = pyControllerData.to_dict()
+                    pyController[pyControllerName] = pyControllerDict
+                self.pyControllers[pyControllerType] = pyController
diff --git a/build/lib/PyDSS/pyLogger.py b/build/lib/PyDSS/pyLogger.py
new file mode 100644
index 00000000..cceedc36
--- /dev/null
+++ b/build/lib/PyDSS/pyLogger.py
@@ -0,0 +1,25 @@
+import logging
+import os
+
+
+def getLogger(name, path, LoggerOptions=None):
+    if LoggerOptions['Clear old log files']:
+        test = os.listdir(os.getcwd())
+        for item in test:
+            if item.endswith(".log"):
+                os.remove(item)
+    formatter = logging.Formatter(fmt='%(asctime)s - %(levelname)s - %(module)s - %(message)s')
+
+    logger = logging.getLogger(name)
+    logger.setLevel(LoggerOptions['Logging Level'])
+    if LoggerOptions['Display on screen']:
+        handler1 = logging.StreamHandler()
+        handler1.setFormatter(formatter)
+        logger.addHandler(handler1)
+    if LoggerOptions['Log to external file']:
+        if not os.path.exists(path):
+            os.mkdir(path)
+        handler2 = logging.FileHandler(filename=os.path.join(path, name + '.log'))
+        handler2.setFormatter(formatter)
+        logger.addHandler(handler2)
+    return logger
diff --git a/build/lib/PyDSS/pyPlotReader.py b/build/lib/PyDSS/pyPlotReader.py
new file mode 100644
index 00000000..69dd2497
--- /dev/null
+++ b/build/lib/PyDSS/pyPlotReader.py
@@ -0,0 +1,23 @@
+import os
+import pandas as pd
+
+class pyPlotReader:
+    pyPlots = {}
+
+    def __init__(self, Path = r'C:/Users/alatif/Desktop/PyDSS-heco/Import/pyPlotList'):
+        self.pyPlots = {}
+        filenames = os.listdir(Path)
+        for filename in filenames:
+            if filename.endswith('.xlsx'):
+                pyPlotType  = filename.split('.')[0]
+                PlotDataset = pd.read_excel(os.path.join(Path, filename), skiprows= [0,], index_col = [0])
+                pyPlotNames = PlotDataset.index.tolist()
+                pyPlot = {}
+                for pyPlotName in pyPlotNames:
+                    pyPlotData = PlotDataset.loc[pyPlotName]
+                    pyPlotDict = pyPlotData.to_dict()
+                    pyPlot[pyPlotName] =  pyPlotDict
+                self.pyPlots[pyPlotType] = pyPlot
+
+
+
diff --git a/build/lib/PyPlots/GISplot.py b/build/lib/PyPlots/GISplot.py
new file mode 100644
index 00000000..405b1b8a
--- /dev/null
+++ b/build/lib/PyPlots/GISplot.py
@@ -0,0 +1,204 @@
+from bokeh.plotting import figure, curdoc
+from bokeh.io import output_file, save
+from bokeh.models import ColumnDataSource, HoverTool, BoxSelectTool, PanTool, WheelZoomTool, \
+    GMapPlot, GMapOptions, Range1d, MultiLine, Square, Circle, Triangle
+from bokeh.client import push_session
+import pandas as pd
+import numpy as np
+try:
+    import pyproj
+except ImportError:
+    print('Package pyproj not installed. Cannot use GISplot')
+
+
+class Plot:
+    Vmin = 0.95
+    Vmax = 1.05
+    Imin = 0
+    Imax = 100
+    VoltagePhase = 0
+    CurrentPhase = 0
+    def __init__(self,PlotProperties,dssBuses,dssObjectsByClass,dssCircuit):
+        self.__dssBuses = dssBuses
+        self.__PlotProperties = PlotProperties
+        self.__dssObjectsByClass = dssObjectsByClass
+
+        if PlotProperties['Projection']:
+            self.__source_proj = pyproj.Proj("+init=EPSG:2784")# + PlotProperties['Project from'])
+            self.__target_proj = pyproj.Proj("+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs")
+            self.__meter_factor = 0.3048006096012192
+
+        BusProperty = list(dssBuses)[0]
+        busProperties = dssBuses[BusProperty].GetVariableNames()
+        newbusProperties = []
+        for busProperty in busProperties:
+            if dssBuses[BusProperty].DataLength(busProperty)[1] == 'Number':
+                newbusProperties.append(busProperty)
+            if dssBuses[BusProperty].DataLength(busProperty)[1] == 'List':
+                t =  dssBuses[BusProperty].GetVariable(busProperty)[0]
+                if isinstance(t,float):
+                    newbusProperties.append(busProperty)
+        # output to static HTML file
+
+        self.LineData = self.GetLineData()
+        self.BusData = self.GetBusData()
+
+        if PlotProperties['Projection']:
+            self.BusData['X'], self.BusData['Y'] = self.__transform(self.BusData['X'].tolist(),
+                                                                    self.BusData['Y'].tolist())
+
+
+
+        self.ResourceXYbyClass = self.GetResourceData()
+        self.busDataSource = ColumnDataSource(self.BusData)
+
+        ##########################     TOOL TIP DATA    ################################
+        hoverBus = HoverTool(tooltips=[
+            ("Name", "@Name"),
+            ("(x,y)", "(@X, @Y)"),
+            ("Voltage", "@puVoltage"),
+        ])
+
+        ##########################     Figure creation     ################################
+        doc = curdoc()
+
+        map_options = GMapOptions(lat=PlotProperties['Longitude'], lng=PlotProperties['Latitute'],
+                                  map_type=PlotProperties['MapType'], zoom=PlotProperties['Zoom level'])
+        self.__Figure = GMapPlot(x_range=Range1d(), y_range=Range1d(), map_options=map_options)
+        self.__Figure.api_key = PlotProperties['Google Key']
+
+        self.LineDataSource = ColumnDataSource(self.LineDict)
+        self.Lineplot = MultiLine(xs="x", ys="y", line_color='green')
+        self.__Figure.add_glyph(self.LineDataSource, self.Lineplot)
+
+        self.BusPlot = Circle(x='X', y='Y', fill_color="blue", fill_alpha=0.8, line_color=None)
+        self.__Figure.add_glyph(self.busDataSource, self.BusPlot)
+
+        self.PlotElementClass('Transformers', 'black', 'circle')
+        self.PlotElementClass('PVsystems', 'yellow', 'square')
+        self.PlotElementClass('Loads', 'red', 'triangle')
+
+        self.__Figure.add_tools(PanTool(), WheelZoomTool(), BoxSelectTool())
+
+        output_file(PlotProperties['FileName'])
+
+        doc.add_root(self.__Figure)
+        doc.title = "PyDSS"
+
+        session = push_session(doc)
+        session.show(self.__Figure)  # open the document in a browser
+
+        return
+
+    def __transform(self, X, Y):
+        Xt = []
+        Yt = []
+        if isinstance(X, list) and isinstance(X, list):
+            for x1, y1 in zip(X, Y):
+                Ans = pyproj.transform(self.__source_proj, self.__target_proj, float(x1) * self.__meter_factor,
+                                       float(y1) * self.__meter_factor)
+                print(x1, y1, ' - ', Ans[0], Ans[1])
+                Xt.append(Ans[0])
+                Yt.append(Ans[1])
+        else:
+            Xt, Yt= pyproj.transform(self.__source_proj, self.__target_proj, float(X) * self.__meter_factor,
+                                       float(Y) * self.__meter_factor)
+
+        return Xt, Yt
+
+    def UpdatePlot(self):
+
+        return
+
+
+    def PlotElementClass(self, Class, Color, Shape):
+        X = self.ResourceXYbyClass[Class][0]
+        Y = self.ResourceXYbyClass[Class][1]
+
+        if self.__PlotProperties['Projection']:
+            X, Y = self.__transform(X,Y)
+
+        DataSource = ColumnDataSource({ 'X' : X ,'Y' : Y})
+        Scatter = None
+        if Shape=='square':
+            Scatter = Square(x='X', y='Y', fill_color=Color, fill_alpha=0.8, line_color=None)
+        elif Shape=='circle':
+            Scatter = Circle(x='X', y='Y', fill_color=Color, fill_alpha=0.8, line_color=None)
+        elif Shape=='triangle':
+            Scatter = Triangle(x='X', y='Y', fill_color=Color, fill_alpha=0.8, line_color=None)
+        self.__Figure.add_glyph(DataSource, Scatter)
+
+    def GetResourceData(self):
+        ResourceXYbyClass = {}
+        for ObjectClass in self.__dssObjectsByClass.keys():
+            if self.__dssObjectsByClass[ObjectClass]:
+                ResourceXYbyClass[ObjectClass] = [[], [], [], [], []]
+                for dssObject in self.__dssObjectsByClass[ObjectClass]:
+                    Object = self.__dssObjectsByClass[ObjectClass][dssObject]
+                    if Object.BusCount == 1:
+                        BusName = Object.Bus[0].split('.')[0]
+                        X, Y = self.__dssBuses[BusName].XY
+                        if X != 0 and Y != 0:
+                            ResourceXYbyClass[ObjectClass][0].append(X)
+                            ResourceXYbyClass[ObjectClass][1].append(Y)
+                            ResourceXYbyClass[ObjectClass][2].append(Y)
+                    if Object.BusCount == 2:
+                        BusName1 = Object.Bus[0].split('.')[0]
+                        BusName2 = Object.Bus[1].split('.')[0]
+                        X1, Y1 = self.__dssBuses[BusName1].XY
+                        X2, Y2 = self.__dssBuses[BusName2].XY
+                        if (X1 != 0 and Y1 != 0) and (X2 == 0 and Y2 == 0):
+                            ResourceXYbyClass[ObjectClass][0].append(X1)
+                            ResourceXYbyClass[ObjectClass][1].append(Y1)
+                        elif (X1 == 0 and Y1 == 0) and (X2 != 0 and Y2 != 0):
+                            ResourceXYbyClass[ObjectClass][0].append(X2)
+                            ResourceXYbyClass[ObjectClass][1].append(Y2)
+                        elif (X1 != 0 and Y1 != 0) and (X2 != 0 and Y2 != 0):
+                            ResourceXYbyClass[ObjectClass][0].append((X1 + X2) / 2)
+                            ResourceXYbyClass[ObjectClass][1].append((Y1 + Y2) / 2)
+        return ResourceXYbyClass
+
+    def GetBusData(self):
+        busX = []
+        busY = []
+        busNames = []
+        busVoltage = []
+        for dssBus in self.__dssBuses.keys():
+            XY = self.__dssBuses[dssBus].XY
+            if XY[0] != 0 and XY[1] != 0:
+                busNames.append(dssBus)
+                busX.append(float(XY[0]))
+                busY.append(float(XY[1]))
+                busVoltage.append(float(self.__dssBuses[dssBus].GetVariable('puVmagAngle')[2 * self.VoltagePhase]))
+
+        BusData = pd.DataFrame(np.transpose([busNames, busX, busY, busVoltage]),
+                               columns=['Name', 'X', 'Y', 'puVoltage'])
+        return BusData
+
+    def GetLineData(self):
+        LineX = []
+        LineY = []
+        LineName = []
+        LineCurrent = []
+        Lines = self.__dssObjectsByClass['Lines']
+        for name, Line in Lines.items():
+            Bus1, Bus2 = Line.Bus
+            X1, Y1 = self.__dssBuses[Bus1.split('.')[0]].XY
+            X2, Y2 = self.__dssBuses[Bus2.split('.')[0]].XY
+            if (X1 != 0 and Y1 != 0) and (X2 != 0 and Y2 != 0):
+                if self.__PlotProperties['Projection']:
+                    X1, Y1 = self.__transform(X1, Y1)
+                    X2, Y2 = self.__transform(X2, Y2)
+                LineX.append([float(X1), float(X2)])
+                LineY.append([float(Y1), float(Y2)])
+                LineName.append(name)
+                LineCurrent.append(float(Line.GetVariable('CurrentsMagAng')[2 * self.CurrentPhase]))
+
+        self.LineDict = {
+            'x': LineX,
+            'y': LineY,
+        }
+
+        LineData = pd.DataFrame(np.transpose([LineName, LineCurrent]),
+                                     columns=['Name', 'Current'])
+        return LineData
diff --git a/build/lib/PyPlots/Histogram.py b/build/lib/PyPlots/Histogram.py
new file mode 100644
index 00000000..b8401357
--- /dev/null
+++ b/build/lib/PyPlots/Histogram.py
@@ -0,0 +1,105 @@
+from bokeh.plotting import figure, curdoc
+from bokeh.io import output_file
+from bokeh.client import push_session
+from bokeh.layouts import  column
+from bokeh.palettes import Set1
+from ast import literal_eval as LE
+from bokeh.models import ColumnDataSource, ColorBar, \
+    LinearColorMapper, HoverTool, BoxSelectTool, BoxZoomTool, \
+    PanTool, WheelZoomTool, ResetTool, SaveTool, Label
+import pandas as pd
+import numpy as np
+import math
+
+class Plot:
+	def __init__(self,PlotProperties, dssBuses, dssObjectsbyClass, dssCircuit):
+		Data = []
+		self.__dssBuses = dssBuses
+		self.__PlotProperties = PlotProperties
+		self.__dssObjectsByClass = dssObjectsbyClass
+		self.__index = self.__PlotProperties['index']
+		if self.__PlotProperties['ObjectType'] == 'Buses':
+			self.Objects = dssBuses
+		else:
+			self.Objects = self.__dssObjectsByClass[self.__PlotProperties['ObjectType']]
+		for ObjName in self.Objects:
+			if self.__PlotProperties['ObjectType'] == 'Buses':
+				Value = self.Objects[ObjName].GetVariable(self.__PlotProperties['Property'])
+			else:
+				Value = self.Objects[ObjName].GetValue(self.__PlotProperties['Property'])
+			Value = np.multiply(Value, float(self.__PlotProperties['Scaler']))
+
+			if len(Value) == 1:
+				Value = float(Value)
+			elif self.__index == 'SumEven':
+				Value = sum(Value[::2])
+			elif self.__index == 'SumOdd':
+				Value = sum(Value[1::2])
+			elif self.__index == 'MaxEven':
+				Value = max(Value[::2])
+			elif self.__index == 'MinEven':
+				Value = min(Value[::2])
+			elif self.__index == 'MaxOdd':
+				Value = max(Value[1::2])
+			elif self.__index == 'MinOdd':
+				Value = min(Value[1::2])
+			elif self.__index == 'AvgEven':
+				Value = np.mean(Value[1::2])
+			elif self.__index == 'AvgOdd':
+				Value = np.mean(Value[1::2])
+			elif 'Index=' in self.__index:
+				c = int(self.__index.replace('Index=', ''))
+				Value = Value[c]
+			Data.append(Value)
+		output_file(PlotProperties['FileName'])
+		self.__Figure = figure(plot_width=int(self.__PlotProperties['Width']),
+							   plot_height=int(self.__PlotProperties['Height']))  # tools=[hover]
+
+		hhist, hedges = np.histogram(Data, bins=PlotProperties['bins'])
+
+		self.Hist = self.__Figure.quad(top=hhist, bottom=0, left=hedges[:-1], right=hedges[1:],
+        fill_color="#036564", line_color="#033649")
+		curdoc().add_root(self.__Figure)
+		curdoc().title = "PyDSS"
+
+		session = push_session(curdoc())
+		session.show(self.__Figure)
+		return
+
+	def UpdatePlot(self):
+		Data = []
+		for ObjName in self.Objects:
+			if self.__PlotProperties['ObjectType'] == 'Buses':
+				Value = self.Objects[ObjName].GetVariable(self.__PlotProperties['Property'])
+			else:
+				Value = self.Objects[ObjName].GetValue(self.__PlotProperties['Property'])
+			Value = np.multiply(Value, float(self.__PlotProperties['Scaler']))
+
+			if len(Value) == 1:
+				Value = float(Value)
+			elif self.__index == 'SumEven':
+				Value = sum(Value[::2])
+			elif self.__index == 'SumOdd':
+				Value = sum(Value[1::2])
+			elif self.__index == 'MaxEven':
+				Value = max(Value[::2])
+			elif self.__index == 'MinEven':
+				Value = min(Value[::2])
+			elif self.__index == 'MaxOdd':
+				Value = max(Value[1::2])
+			elif self.__index == 'MinOdd':
+				Value = min(Value[1::2])
+			elif self.__index == 'AvgEven':
+				Value = np.mean(Value[1::2])
+			elif self.__index == 'AvgOdd':
+				Value = np.mean(Value[1::2])
+			elif 'Index=' in self.__index:
+				c = int(self.__index.replace('Index=', ''))
+				Value = Value[c]
+			Data.append(Value)
+		hhist, hedges = np.histogram(Data, bins=self.__PlotProperties['bins'])
+		self.Hist.data_source.data['top']   = hhist
+		self.Hist.data_source.data['left']  = hedges[:-1]
+		self.Hist.data_source.data['right'] = hedges[1:]
+
+		return 0
\ No newline at end of file
diff --git a/build/lib/PyPlots/SagPlot.py b/build/lib/PyPlots/SagPlot.py
new file mode 100644
index 00000000..cf301a45
--- /dev/null
+++ b/build/lib/PyPlots/SagPlot.py
@@ -0,0 +1,128 @@
+from bokeh.plotting import figure, curdoc
+from bokeh.io import output_file
+from bokeh.client import push_session
+from bokeh.layouts import  column
+from bokeh.palettes import Set1
+from ast import literal_eval as LE
+from bokeh.models import ColumnDataSource, ColorBar, \
+    LinearColorMapper, HoverTool, BoxSelectTool, BoxZoomTool, \
+    PanTool, WheelZoomTool, ResetTool, SaveTool, Label
+import pandas as pd
+import numpy as np
+import math
+
+class Plot:
+	def __init__(self,PlotProperties, dssBuses, dssObjectsbyClass, dssCircuit):
+
+		self.__dssBuses = dssBuses
+		self.__PlotProperties = PlotProperties
+		self.__dssObjectsByClass = dssObjectsbyClass
+
+		self.VoltagePhase = PlotProperties['Phase']
+		#for BusName in dssBuses:
+		#	print(dssBuses[BusName].Distance)
+
+		self.BusData = self.GetBusData()
+		self.LineData = self.GetLineData()
+		self.busDataSource = ColumnDataSource(self.BusData)
+		Vlb = PlotProperties['Vlb']
+		Vub = PlotProperties['Vub']
+		##########################     TOOL TIP DATA    ################################
+		hoverBus = HoverTool(tooltips=[
+			("Name", "@Name"),
+			("Distance", "@Distance"),
+			("Voltage", "@puVoltage"),
+		])
+
+		output_file(PlotProperties['FileName'])
+		self.__Figure = figure(plot_width=int(self.__PlotProperties['Width']),
+							   plot_height=int(self.__PlotProperties['Height']),
+							   tools=[ResetTool(), hoverBus, BoxSelectTool(), SaveTool(),
+									  BoxZoomTool(), WheelZoomTool(), PanTool()])  # tools=[hover]
+		a = self.BusData['Distance'].max()
+		self.BusPlot = self.__Figure.circle(x='Distance', y='puVoltage', source=self.busDataSource, legend='Nodes')
+		self.lineLB = self.__Figure.line([0, PlotProperties['Dmax']], [Vlb, Vlb], line_width=2)
+		self.lineUB = self.__Figure.line([0, PlotProperties['Dmax']], [Vub, Vub], line_width=2)
+		self.Lineplot = self.__Figure.multi_line(self.LineX, self.LineY, legend='Lines', color='green')
+		self.Lineplot1 = self.__Figure.multi_line(self.trX, self.trY, legend='XFMRs', color='red')
+
+		self.__Figure.legend.location = "top_right"
+		self.__Figure.legend.click_policy = "hide"
+
+		curdoc().add_root(self.__Figure)
+		curdoc().title = "PyDSS"
+
+		session = push_session(curdoc())
+		session.show(self.__Figure)
+		return
+
+
+	def GetBusData(self):
+
+		self.busNames = []
+		busVoltage = []
+		busDistance = []
+
+		for dssBus in self.__dssBuses:
+			if self.__PlotProperties['Voltage Level'] == 'All':
+				self.busNames.append(dssBus)
+				busDistance.append(float(self.__dssBuses[dssBus].Distance))
+				busVoltage.append(float(self.__dssBuses[dssBus].GetVariable('puVmagAngle')[2 * int(self.VoltagePhase)]))
+			elif float(self.__PlotProperties['Voltage Level'])  == self.__dssBuses[dssBus].GetVariable('kVBase') * math.sqrt(3):
+				self.busNames.append(dssBus)
+				busDistance.append(float(self.__dssBuses[dssBus].Distance))
+				busVoltage.append(float(self.__dssBuses[dssBus].GetVariable('puVmagAngle')[2 * int(self.VoltagePhase)]))
+
+		BusData = pd.DataFrame(np.transpose([self.busNames, busDistance, busVoltage]),
+							   columns=['Name', 'Distance', 'puVoltage'])
+		return BusData
+
+	def GetLineData(self):
+		self.LineX = []
+		self.LineY = []
+
+		self.trX = []
+		self.trY = []
+		LineName = []
+
+		XFMRs = self.__dssObjectsByClass['Transformers']
+		Lines = self.__dssObjectsByClass['Lines']
+
+
+		for name, Line in Lines.items():
+			Bus1, Bus2 = nBuses = Line.Bus
+			Bus1 = Bus1.split('.')[0]
+			Bus2 = Bus2.split('.')[0]
+			if Bus1 in self.busNames or Bus2 in self.busNames:
+				X1 = self.__dssBuses[Bus1].Distance
+				Y1 = self.__dssBuses[Bus1].GetVariable('puVmagAngle')[2 * int(self.VoltagePhase)]
+				X2 = self.__dssBuses[Bus2].Distance
+				Y2 = self.__dssBuses[Bus2].GetVariable('puVmagAngle')[2 * int(self.VoltagePhase)]
+				if (X1 != 0 and Y1 != 0) and (X2 != 0 and Y2 != 0):
+					self.LineX.append([float(X1), float(X2)])
+					self.LineY.append([float(Y1), float(Y2)])
+					LineName.append(name)
+
+		for name, Line in XFMRs.items():
+			Bus1, Bus2 = nBuses = Line.Bus
+			Bus1 = Bus1.split('.')[0]
+			Bus2 = Bus2.split('.')[0]
+			if Bus1 in self.busNames or Bus2 in self.busNames:
+				X1 = self.__dssBuses[Bus1].Distance
+				Y1 = self.__dssBuses[Bus1].GetVariable('puVmagAngle')[2 * int(self.VoltagePhase)]
+				X2 = self.__dssBuses[Bus2].Distance
+				Y2 = self.__dssBuses[Bus2].GetVariable('puVmagAngle')[2 * int(self.VoltagePhase)]
+				if (X1 != 0 and Y1 != 0) and (X2 != 0 and Y2 != 0):
+					self.trX.append([float(X1), float(X2)])
+					self.trY.append([float(Y1), float(Y2)])
+					LineName.append(name)
+		return 0
+
+	def UpdatePlot(self):
+		self.BusData = self.GetBusData()
+		self.LineData = self.GetLineData()
+		self.Lineplot.data_source.data['ys'] = self.LineY
+		self.Lineplot1.data_source.data['ys'] = self.trY
+		self.busDataSource.data['puVoltage'] = self.BusData['puVoltage']
+
+		return 0
\ No newline at end of file
diff --git a/build/lib/PyPlots/TimeSeries.py b/build/lib/PyPlots/TimeSeries.py
new file mode 100644
index 00000000..437d858e
--- /dev/null
+++ b/build/lib/PyPlots/TimeSeries.py
@@ -0,0 +1,121 @@
+from bokeh.plotting import figure, curdoc
+from bokeh.io import output_file
+from bokeh.client import push_session
+from bokeh.layouts import  column
+from bokeh.palettes import Set1
+from ast import literal_eval as LE
+
+class Plot:
+    def __init__(self,PlotProperties, dssBuses, dssObjects, dssCircuit):
+
+        self.__dssBuses = dssBuses
+        self.__dssObjs = dssObjects
+        self.__PlotProperties = PlotProperties
+        self.__Properties =  LE(PlotProperties['Properties'])
+        self.__index = LE(PlotProperties['index'])
+        self.__multiplier = LE(PlotProperties['yScaler'])
+
+        if self.__PlotProperties['yObjectType'] == 'Element':
+            self.yObj = self.__dssObjs[self.__PlotProperties['yObjName']]
+        elif self.__PlotProperties['yObjectType'] == 'Bus':
+            self.yObj = self.__dssBuses[self.__PlotProperties['yObjName']]
+        elif self.__PlotProperties['yObjectType'] == 'Circuit':
+            self.yObj = dssCircuit
+
+        self.Figures = []
+        self.Y = [[] for x in self.__Properties]
+        self.X = [[] for x in self.__Properties]
+        self.Lines = [None for x in self.__Properties]
+        output_file(PlotProperties['FileName'])
+        for i, yProperties in enumerate(self.__Properties):
+            Multiplier = self.__multiplier[i]
+            pptyType ,Property = yProperties.split('.')
+            if pptyType == 'p':
+                newValue = self.yObj.GetParameter(Property)
+            elif pptyType == 'v' and self.__PlotProperties['yObjectType'] != 'Circuit':
+                newValue = self.yObj.GetVariable(Property)
+            elif pptyType == 'v' and self.__PlotProperties['yObjectType'] == 'Circuit':
+                newValue = getattr(self.yObj, Property)()
+
+            if newValue is not None:
+                if isinstance(newValue, list):
+
+                    if self.__index[i] == 'SumEven':
+                        self.Y[i].append(Multiplier * sum(newValue[::2]))
+                    elif self.__index[i] == 'SumOdd':
+                        self.Y[i].append(Multiplier * sum(newValue[1::2]))
+                    elif self.__index[i] == 'Even' :
+                        self.Y[i]= [[Multiplier * x] for x in newValue[::2]]
+                    elif self.__index[i] == 'Odd':
+                        self.Y[i] = [[Multiplier * x] for x in newValue[1::2]]
+                    elif 'Index=' in self.__index[i]:
+                        c = int(self.__index[i].replace('Index=', ''))
+                        self.Y[i].append(Multiplier * newValue[c])
+                else:
+                    self.Y[i].append(Multiplier * newValue)
+                self.X[i] = range(len(self.Y[i])+1)
+
+            Figure = figure(plot_width=self.__PlotProperties['Width'],
+                            plot_height=self.__PlotProperties['Height'],
+                            title=self.__PlotProperties['yObjName'])
+            if isinstance(self.Y[i][0], list):
+                self.Lines[i] = []
+                for j, Y in enumerate(self.Y[i]):
+                    a = Figure.line(self.X[i], Y, line_width=3, line_alpha=1, color=Set1[9][j])
+                    self.Lines[i].append(a)
+            else:
+                self.Lines[i] = Figure.line(self.X[i], self.Y[i], line_width=3, line_alpha=1)
+            Figure.yaxis.axis_label = Property + '-' + self.__index[i]
+            Figure.xaxis.axis_label = 'Timesteps'
+            self.Figures.append(Figure)
+
+        self.Layout = column(self.Figures)
+        self.doc = curdoc()
+        self.doc.add_root(self.Layout)
+        self.doc.title = "PyDSS"
+        self.session = push_session(self.doc)
+        self.session.show(self.Layout)  # open the document in a browser
+
+        return
+
+    def UpdatePlot(self):
+        for i, yProperties in enumerate(self.__Properties):
+            Multiplier = self.__multiplier[i]
+            pptyType ,Property = yProperties.split('.')
+            if pptyType == 'p':
+                newValue = self.yObj.GetParameter(Property)
+            elif pptyType == 'v' and self.__PlotProperties['yObjectType'] != 'Circuit':
+                newValue = self.yObj.GetVariable(Property)
+            elif pptyType == 'v' and self.__PlotProperties['yObjectType'] == 'Circuit':
+                newValue = getattr(self.yObj, Property)()
+
+            if newValue is not None:
+                if isinstance(newValue, list):
+                    if self.__index[i] == 'SumEven':
+                        self.Y[i].append(Multiplier * sum(newValue[::2]))
+                    elif self.__index[i] == 'SumOdd':
+                        self.Y[i].append(Multiplier * sum(newValue[1::2]))
+                    elif self.__index[i] == 'Even':
+                        for j, Value in enumerate(newValue[::2]):
+                            self.Y[i][j].append(Multiplier * Value)
+                    elif self.__index[i] == 'Odd':
+                        for j, Value in enumerate(newValue[1::2]):
+                            self.Y[i][j].append(Multiplier * Value)
+                    elif 'Index=' in self.__index[i]:
+                        c = int(self.__index[i].replace('Index=',''))
+                        self.Y[i].append(Multiplier * newValue[c])
+                else:
+                    self.Y[i].append(Multiplier * newValue)
+                self.X[i] = range(len(self.Y[i])+1)
+
+            if isinstance(self.Y[i][0], list):
+                for j, Y in enumerate(self.Y[i]):
+                    self.Lines[i][j].data_source.data['x'] = range(len(Y)+1)
+                    self.Lines[i][j].data_source.data['y'] = Y
+            else:
+                if self.__PlotProperties['Dynamic'] and len(self.X[i]) > self.__PlotProperties['nSamples']:
+                    self.X[i] = self.X[i][-self.__PlotProperties['nSamples']:]
+                    self.Y[i] = self.Y[i][-self.__PlotProperties['nSamples']:]
+                self.Lines[i].data_source.data['x'] = self.X[i]
+                self.Lines[i].data_source.data['y'] = self.Y[i]
+        return
diff --git a/build/lib/PyPlots/Topology.py b/build/lib/PyPlots/Topology.py
new file mode 100644
index 00000000..f5158b09
--- /dev/null
+++ b/build/lib/PyPlots/Topology.py
@@ -0,0 +1,216 @@
+from bokeh.plotting import figure, curdoc
+from bokeh.io import output_file
+from bokeh.models import ColumnDataSource, ColorBar, \
+    LinearColorMapper, HoverTool, BoxSelectTool, BoxZoomTool, \
+    PanTool, WheelZoomTool, ResetTool, SaveTool, Label
+from bokeh.palettes import Viridis, Plasma
+from bokeh.client import push_session
+import pandas as pd
+import numpy as np
+
+class Plot:
+    Vmin = 0.95
+    Vmax = 1.05
+    Imin = 0
+    Imax = 100
+    VoltagePhase = 0
+    CurrentPhase = 0
+    def __init__(self,PlotProperties,dssBuses,dssObjectsByClass,dssCircuit):
+        self.__dssBuses = dssBuses
+        self.__PlotProperties = PlotProperties
+        self.__dssObjectsByClass = dssObjectsByClass
+
+        BusProperty = list(dssBuses)[0]
+        busProperties = dssBuses[BusProperty].GetVariableNames()
+        newbusProperties = []
+        for busProperty in busProperties:
+            if dssBuses[BusProperty].DataLength(busProperty)[1] == 'Number':
+                newbusProperties.append(busProperty)
+            if dssBuses[BusProperty].DataLength(busProperty)[1] == 'List':
+                t =  dssBuses[BusProperty].GetVariable(busProperty)[0]
+                if isinstance(t,float):
+                    newbusProperties.append(busProperty)
+        # output to static HTML file
+
+        self.LineData = self.GetLineData()
+        self.BusData = self.GetBusData()
+        self.ResourceXYbyClass = self.GetResourceData()
+        self.busDataSource = ColumnDataSource(self.BusData)
+
+        ##########################     TOOL TIP DATA    ################################
+        hoverBus = HoverTool(tooltips=[
+            ("Name", "@Name"),
+            ("(x,y)", "(@X, @Y)"),
+            ("Voltage", "@puVoltage"),
+        ])
+
+        ##########################     Figure creation     ################################
+        doc = curdoc()
+
+        output_file(PlotProperties['FileName'])
+        self.__Figure = figure(plot_width=self.__PlotProperties['Width'],
+                               plot_height=self.__PlotProperties['Height'],
+                               tools=[ResetTool(), hoverBus, BoxSelectTool(), SaveTool(),
+                                      BoxZoomTool(), WheelZoomTool(), PanTool()])  # tools=[hover]
+
+        self.__Figure.xgrid.grid_line_color = None
+        self.__Figure.ygrid.grid_line_color = None
+        self.__Figure.axis.visible = False
+
+        self.VoltageColorPallete= Viridis[256]
+        self.CurrentColorPallete= Plasma[256][200::-1]
+
+        VoltageColor = self.GetColorArray(self.BusData['puVoltage'].astype(float), self.VoltageColorPallete, 'Voltage')
+        CurrentColor = self.GetColorArray(self.LineData['Current'].astype(float), self.CurrentColorPallete, 'Current')
+        mapperVolatge = LinearColorMapper(palette=self.VoltageColorPallete, low=self.Vmin, high=self.Vmax)
+        mapperCurrent = LinearColorMapper(palette=self.CurrentColorPallete, low=self.Imin, high=self.Imax)
+        ## PLOTS
+        self.Lineplot = self.__Figure.multi_line(self.LineX, self.LineY, color=CurrentColor, legend='Lines')
+        self.BusPlot = self.__Figure.circle(x='X', y='Y', source=self.busDataSource, color=VoltageColor, legend='Bus', size=5)
+
+        self.PlotElementClass('Loads', 'red', 'triangle')
+        self.PlotElementClass('PVsystems', 'darkorchid', 'square')
+        self.PlotElementClass('Transformers', 'brown', 'circle')
+
+        self.__Figure.legend.location = "top_left"
+        self.__Figure.legend.click_policy = "hide"
+
+        self.Voltage_color_bar = ColorBar(color_mapper=mapperVolatge, location=(0, 0),
+                                     height=int(self.__PlotProperties['Height'] / 2) - 50)
+        LABEL1 = Label(x=0, y=630, x_units='screen', y_units='screen',
+                       text='Voltage [p.u.]', render_mode='css',
+                       background_fill_color='white', background_fill_alpha=1.0, angle=3.142 / 2)
+
+        LABEL2 = Label(x=0, y=200, x_units='screen', y_units='screen',
+                       text='Current [Amp]', render_mode='css',
+                       background_fill_color='white', background_fill_alpha=1.0, angle=3.142 / 2)
+
+        self.Current_color_bar = ColorBar(color_mapper=mapperCurrent,
+                                     location=(67, -int(self.__PlotProperties['Height'] / 2)),
+                                     height=int(self.__PlotProperties['Height'] / 2) - 50)
+
+        self.__Figure.add_layout(self.Voltage_color_bar, 'left')
+        self.__Figure.add_layout(self.Current_color_bar, 'left')
+        self.__Figure.add_layout(LABEL1)
+        self.__Figure.add_layout(LABEL2)
+
+        doc.add_root(self.__Figure)
+        doc.title = "PyDSS"
+
+        session = push_session(doc)
+        session.show(self.__Figure)  # open the document in a browser
+
+        return
+
+
+    def UpdatePlot(self):
+
+        self.LineData = self.GetLineData()
+        self.BusData = self.GetBusData()
+        self.busDataSource.data['puVoltage'] = self.BusData['puVoltage']
+        VoltageColors = self.GetColorArray(self.BusData['puVoltage'].astype(float), self.VoltageColorPallete, 'Voltage')
+        self.BusPlot.data_source.data['fill_color']= VoltageColors
+        self.BusPlot.data_source.data['line_color'] = VoltageColors
+
+        CurrentColor = self.GetColorArray(self.LineData['Current'].astype(float), self.CurrentColorPallete, 'Current')
+        self.Lineplot.data_source.data['fill_color'] = CurrentColor
+        self.Lineplot.data_source.data['line_color'] = CurrentColor
+
+        self.Voltage_color_bar.color_mapper.low = self.Vmin
+        self.Voltage_color_bar.color_mapper.high = self.Vmax
+        self.Current_color_bar.color_mapper.low = self.Imin
+        self.Current_color_bar.color_mapper.high = self.Imax
+
+        return
+
+    def GetColorArray(self, DataSeries, Pallete, Type):
+        nBins = len(Pallete)
+        if Type == 'Voltage':
+            bins = np.arange(self.Vmin, self.Vmax, (self.Vmax-self.Vmin)/(nBins+1))
+        else:
+            bins = np.arange(self.Imin, self.Imax, (self.Imax-self.Imin)/(nBins+1))
+
+        nBinEdges = len(bins)
+        if nBinEdges - nBins > 1:
+            bins = bins[:nBins+1]
+
+        ColorArray = pd.cut(DataSeries, bins, labels=Pallete)
+        ColorArray = ColorArray.replace(np.nan, Pallete[-1], regex=True)
+        return ColorArray.tolist()
+
+    def PlotElementClass(self, Class, Color, Shape):
+        X = self.ResourceXYbyClass[Class][0]
+        Y = self.ResourceXYbyClass[Class][1]
+        if Shape=='square':
+            self.__Figure.square(X, Y, color=Color, alpha=1, legend=Class)
+        elif Shape=='circle':
+            self.__Figure.circle(X, Y, color=Color, alpha=1, legend=Class)
+        elif Shape=='triangle':
+            self.__Figure.triangle(X, Y, color=Color, alpha=1, legend=Class)
+
+    def GetResourceData(self):
+        ResourceXYbyClass = {}
+        for ObjectClass in self.__dssObjectsByClass.keys():
+            if self.__dssObjectsByClass[ObjectClass]:
+                ResourceXYbyClass[ObjectClass] = [[], [], [], [], []]
+                for dssObject in self.__dssObjectsByClass[ObjectClass]:
+                    Object = self.__dssObjectsByClass[ObjectClass][dssObject]
+                    if Object.BusCount == 1:
+                        BusName = Object.Bus[0].split('.')[0]
+                        X, Y = self.__dssBuses[BusName].XY
+                        if X != 0 and Y != 0:
+                            ResourceXYbyClass[ObjectClass][0].append(X)
+                            ResourceXYbyClass[ObjectClass][1].append(Y)
+                            ResourceXYbyClass[ObjectClass][2].append(Y)
+                    if Object.BusCount == 2:
+                        BusName1 = Object.Bus[0].split('.')[0]
+                        BusName2 = Object.Bus[1].split('.')[0]
+                        X1, Y1 = self.__dssBuses[BusName1].XY
+                        X2, Y2 = self.__dssBuses[BusName2].XY
+                        if (X1 != 0 and Y1 != 0) and (X2 == 0 and Y2 == 0):
+                            ResourceXYbyClass[ObjectClass][0].append(X1)
+                            ResourceXYbyClass[ObjectClass][1].append(Y1)
+                        elif (X1 == 0 and Y1 == 0) and (X2 != 0 and Y2 != 0):
+                            ResourceXYbyClass[ObjectClass][0].append(X2)
+                            ResourceXYbyClass[ObjectClass][1].append(Y2)
+                        elif (X1 != 0 and Y1 != 0) and (X2 != 0 and Y2 != 0):
+                            ResourceXYbyClass[ObjectClass][0].append((X1 + X2) / 2)
+                            ResourceXYbyClass[ObjectClass][1].append((Y1 + Y2) / 2)
+        return ResourceXYbyClass
+
+    def GetBusData(self):
+        busX = []
+        busY = []
+        busNames = []
+        busVoltage = []
+        for dssBus in self.__dssBuses.keys():
+            XY = self.__dssBuses[dssBus].XY
+            if XY[0] != 0 and XY[1] != 0:
+                busNames.append(dssBus)
+                busX.append(float(XY[0]))
+                busY.append(float(XY[1]))
+                busVoltage.append(float(self.__dssBuses[dssBus].GetVariable('puVmagAngle')[2 * self.VoltagePhase]))
+
+        BusData = pd.DataFrame(np.transpose([busNames, busX, busY, busVoltage]),
+                               columns=['Name', 'X', 'Y', 'puVoltage'])
+        return BusData
+
+    def GetLineData(self):
+        self.LineX = []
+        self.LineY = []
+        LineName = []
+        LineCurrent = []
+        Lines = self.__dssObjectsByClass['Lines']
+        for name, Line in Lines.items():
+            Bus1, Bus2 = Line.Bus
+            X1, Y1 = self.__dssBuses[Bus1.split('.')[0]].XY
+            X2, Y2 = self.__dssBuses[Bus2.split('.')[0]].XY
+            if (X1 != 0 and Y1 != 0) and (X2 != 0 and Y2 != 0):
+                self.LineX.append([float(X1), float(X2)])
+                self.LineY.append([float(Y1), float(Y2)])
+                LineName.append(name)
+                LineCurrent.append(float(Line.GetVariable('CurrentsMagAng')[2 * self.CurrentPhase]))
+
+        LineData = pd.DataFrame(np.transpose([LineName, LineCurrent]),
+                                     columns=['Name', 'Current'])
+        return LineData
diff --git a/build/lib/PyPlots/XYPlot.py b/build/lib/PyPlots/XYPlot.py
new file mode 100644
index 00000000..50b9c6e6
--- /dev/null
+++ b/build/lib/PyPlots/XYPlot.py
@@ -0,0 +1,142 @@
+from bokeh.plotting import figure, curdoc
+from bokeh.io import output_file
+from bokeh.models import ColumnDataSource, ColorBar, \
+    LinearColorMapper, HoverTool, BoxSelectTool, BoxZoomTool, \
+    PanTool, WheelZoomTool, ResetTool, SaveTool, Label
+from bokeh.palettes import Plasma
+from bokeh.client import push_session
+import pandas as pd
+import numpy as np
+
+
+class Plot:
+    def __init__(self,PlotProperties, dssBuses, dssObjects, dssCircuit):
+
+        self.__dssBuses = dssBuses
+        self.__dssObjs = dssObjects
+        self.__dssCircuit = dssCircuit
+        self.__PlotProperties = PlotProperties
+
+        self.xMul = PlotProperties['xScaler']
+        self.yMul = PlotProperties['yScaler']
+        self.cMul = PlotProperties['cScaler']
+
+        self.xInd = PlotProperties['xindex']
+        self.yInd = PlotProperties['yindex']
+        self.cInd = PlotProperties['cindex']
+
+        self.xObj = self.getObject(PlotProperties['xObjName'],PlotProperties['xObjectType'])
+        self.yObj = self.getObject(PlotProperties['yObjName'],PlotProperties['yObjectType'])
+        self.cObj = self.getObject(PlotProperties['cObjName'],PlotProperties['cObjectType'])
+
+        output_file(PlotProperties['FileName'])
+
+        xVal = self.getObjectValue(self.xObj, PlotProperties['xObjectType'], PlotProperties['xProperty'],
+                                   self.xInd, self.xMul)
+        yVal = self.getObjectValue(self.yObj, PlotProperties['yObjectType'], PlotProperties['yProperty'],
+                                   self.yInd, self.yMul)
+        cVal = self.getObjectValue(self.cObj, PlotProperties['cObjectType'], PlotProperties['cProperty'],
+                                   self.cInd, self.cMul)
+
+        self.xVals = [xVal]
+        self.yVals = [yVal]
+        self.cVals = [cVal]
+
+        Data = pd.DataFrame(np.transpose([self.xVals, self.yVals, self.cVals]),
+                               columns=['X', 'Y', 'C'])
+        ColorArray = self.GetColorArray(Data['C'].astype(float), Plasma[256])
+
+        self.__Figure = figure(plot_width=self.__PlotProperties['Width'],
+                        plot_height=self.__PlotProperties['Height'],
+                        title= 'XY Plot: Color - ' + PlotProperties['cObjName'] + ' - ' + PlotProperties['cProperty'])
+
+        self.ScatterPlot = self.__Figure.scatter(x= Data['X'], y=Data['Y'], fill_color=Plasma[256][1],
+                                                 fill_alpha=0.6, line_color=None, size=7)
+
+        self.__Figure.yaxis.axis_label = PlotProperties['yObjName'] + ' - ' + PlotProperties['yProperty']
+        self.__Figure.xaxis.axis_label = PlotProperties['xObjName'] + ' - ' + PlotProperties['xProperty']
+
+        self.doc = curdoc()
+        self.doc.add_root(self.__Figure)
+        self.doc.title = "PyDSS"
+        self.session = push_session(self.doc)
+        self.session.show(self.__Figure)  # open the document in a browser
+        return
+
+    def GetColorArray(self, DataSeries, Pallete):
+        if len(DataSeries)> 10:
+            nBins = len(Pallete)
+            minVal = min(DataSeries)
+            maxVal = max(DataSeries)
+            bins = np.arange(minVal, maxVal, (maxVal-minVal)/(nBins+1))
+
+            nBinEdges = len(bins)
+            if nBinEdges - nBins > 1:
+                bins = bins[:nBins+1]
+
+            ColorArray = pd.cut(DataSeries, bins, labels=Pallete)
+            ColorArray = ColorArray.replace(np.nan, Pallete[-1], regex=True)
+            ColorArray = ColorArray.tolist()
+        else:
+            ColorArray = Pallete[0]
+        return ColorArray
+
+    def getObjectValue(self, Obj, ObjType, ObjPpty, Index, Multiplier):
+        pptyType, Property = ObjPpty.split('.')
+        if pptyType == 'p':
+            pptyValue = float(Obj.GetParameter(Property))
+        elif pptyType == 'v' and ObjType != 'Circuit':
+            pptyValue = Obj.GetVariable(Property)
+        elif pptyType == 'v' and ObjType == 'Circuit':
+            pptyValue = getattr(Obj, Property)()
+
+        if pptyValue is not None:
+            if isinstance(pptyValue, list):
+                if Index == 'SumEven':
+                    result = Multiplier * sum(pptyValue[::2])
+                elif Index == 'SumOdd':
+                    result = Multiplier * sum(pptyValue[1::2])
+                elif Index == 'Even':
+                    result = [[Multiplier * x] for x in pptyValue[::2]]
+                elif Index == 'Odd':
+                    result = [[Multiplier * x] for x in pptyValue[1::2]]
+                elif 'Index=' in Index:
+                    c = int(Index.replace('Index=', ''))
+                    result = Multiplier * pptyValue[c]
+            else:
+                result = Multiplier * pptyValue
+
+        return result
+
+    def getObject(self, ObjName, ObjType):
+        if ObjType == 'Element':
+            Obj = self.__dssObjs[ObjName]
+        elif ObjType == 'Bus':
+            Obj = self.__dssBuses[ObjName]
+        elif ObjType == 'Circuit':
+            Obj = self.__dssCircuit
+        else:
+            Obj = None
+        return Obj
+
+
+    def UpdatePlot(self):
+        xVal = self.getObjectValue(self.xObj, self.__PlotProperties['xObjectType'], self.__PlotProperties['xProperty'],
+                                   self.xInd, self.xMul)
+        yVal = self.getObjectValue(self.yObj, self.__PlotProperties['yObjectType'], self.__PlotProperties['yProperty'],
+                                   self.yInd, self.yMul)
+        cVal = self.getObjectValue(self.cObj, self.__PlotProperties['cObjectType'], self.__PlotProperties['cProperty'],
+                                   self.cInd, self.cMul)
+
+        self.xVals.append(xVal)
+        self.yVals.append(yVal)
+        self.cVals.append(cVal)
+
+        Data = pd.DataFrame(np.transpose([self.xVals, self.yVals, self.cVals]),
+                               columns=['X', 'Y', 'C'])
+        Data = Data.sort_values('X')
+        Data = Data.drop_duplicates(subset=Data.columns)
+        #ColorArray = self.GetColorArray(Data['X'].astype(float), Plasma[256])
+        self.ScatterPlot.data_source.data['x'] = Data['X']
+        self.ScatterPlot.data_source.data['y'] = Data['Y']
+        #self.ScatterPlot
\ No newline at end of file
diff --git a/build/lib/PyPlots/__init__.py b/build/lib/PyPlots/__init__.py
new file mode 100644
index 00000000..a415b786
--- /dev/null
+++ b/build/lib/PyPlots/__init__.py
@@ -0,0 +1 @@
+from . import pyPlots
diff --git a/build/lib/PyPlots/pyPlots.py b/build/lib/PyPlots/pyPlots.py
new file mode 100644
index 00000000..b30289f0
--- /dev/null
+++ b/build/lib/PyPlots/pyPlots.py
@@ -0,0 +1,27 @@
+from . import Topology, SagPlot, Histogram, TimeSeries, XYPlot, GISplot
+
+PlotTypes = {
+    'Network layout' : Topology.Plot,
+	'Sag plot'       : SagPlot.Plot,
+	'Histogram'      : Histogram.Plot,
+	'Time series'    : TimeSeries.Plot,
+	'XY plot'        : XYPlot.Plot,
+    'GIS overlay'    : GISplot.Plot,
+}
+
+
+def Create(PlotType, PlotPropertyDict, dssBuses, dssObjectsByClass, dssCircuit):
+    PlotObject = PlotTypes[PlotType](PlotPropertyDict, dssBuses, dssObjectsByClass, dssCircuit)
+    print(PlotType)
+    # try:
+    #
+    # except:
+    #     print ('The object dictionary does not contain ' + PlotType)
+    #     return -1
+    return PlotObject
+
+
+defalultPO = {
+        'Network layout': False,
+        'Time series': False
+    }
diff --git a/build/lib/pyControllers/HybridController.py b/build/lib/pyControllers/HybridController.py
new file mode 100644
index 00000000..22aa362d
--- /dev/null
+++ b/build/lib/pyControllers/HybridController.py
@@ -0,0 +1,243 @@
+#import matplotlib.pyplot as plt
+import math
+
+class HybridController:
+    TimeChange = False
+    Time = (-1, 0)
+
+    oldPcalc = 0
+    oldQcalc = 0
+    #dPOld = 0
+    #dQOld = 0
+
+    __vDisconnected = False
+    __pDisconnected = False
+
+    def __init__(self, PvObj, Settings, dssInstance, ElmObjectList, dssSolver):
+        self.__ElmObjectList = ElmObjectList
+        #print(PvObj.Bus[0] + ' - ' + PvObj.sBus[0].GetInfo())
+        self.ControlDict = {
+            'None'           : lambda: 0,
+            'CPF'            : self.CPFcontrol,
+            'VPF'            : self.VPFcontrol,
+            'VVar'           : self.VVARcontrol,
+            'VW'             : self.VWcontrol,
+            'Cutoff'         : self.CutoffControl,
+        }
+
+        self.__ControlledElm = PvObj
+        Class, Name = self.__ControlledElm.GetInfo()
+        self.__Name = 'pyCont_' + Class + '_' + Name
+        if '_' in Name:
+            self.Phase = Name.split('_')[1]
+        else:
+            self.Phase = None
+        self.__ElmObjectList = ElmObjectList
+        self.__ControlledElm = PvObj
+        self.__dssInstance = dssInstance
+        self.__dssSolver = dssSolver
+        self.__Settings = Settings
+
+        self.update = [self.ControlDict[Settings['Control' + str(i)]] for i in [1, 2, 3]]
+
+        return
+
+    def Update(self, Priority, Time, Update):
+        self.TimeChange = self.Time != (Priority, Time)
+        self.Time = (Priority, Time)
+        # Ppv = -sum(self.__ControlledElm.GetVariable('Powers')[::2]) / self.__Prated
+        # if self.__pDisconnected:
+        #     if Ppv < self.__cutin:
+        #         return 0
+        #     else:
+        #         self.__pDisconnected = False
+        # else:
+        #     if Ppv < self.__cutout:
+        #         self.__pDisconnected = True
+        #         self.__ControlledElm.SetParameter('pf', 1)
+        #         return 0
+        return self.update[Priority]()
+
+    def VWcontrol(self):
+        uMinC = self.__Settings['uMinC']
+        uMaxC = self.__Settings['uMaxC']
+        Pmin  = self.__Settings['PminVW'] / 100
+
+        uIn = max(self.__ControlledElm.sBus[0].GetVariable('puVmagAngle')[::2])
+        Ppv = -sum(self.__ControlledElm.GetVariable('Powers')[::2]) / self.__Srated
+        Qpv = -sum(self.__ControlledElm.GetVariable('Powers')[1::2]) / self.__Srated
+        #PpvoutPU = Ppv / self.__Prated
+
+        Plim = (1 - Qpv ** 2) ** 0.5 if self.__Settings['VWtype'] == 'Available Power' else 1
+        m = (1 - Pmin) / (uMinC - uMaxC)
+        #m = (Plim - Pmin) / (uMinC - uMaxC)
+        c = ((Pmin * uMinC) - uMaxC) / (uMinC - uMaxC)
+
+        if uIn < uMinC:
+            Pcalc = Plim
+        elif uIn < uMaxC and uIn > uMinC:
+            Pcalc = min(m * uIn + c, Plim)
+        else:
+            Pcalc = Pmin
+
+        if Ppv > Pcalc or (Ppv > 0 and self.Pmppt < 100):
+            # adding heavy ball term to improve convergence
+            dP = (Ppv - Pcalc) * 0.5 / self.__dampCoef + (self.oldPcalc - Ppv) * 0.1 / self.__dampCoef
+            Pcalc = Ppv - dP
+            self.Pmppt = min(self.Pmppt * Pcalc / Ppv, 100)
+            self.__ControlledElm.SetParameter('pctPmpp', self.Pmppt)
+            self.pf = math.cos(math.atan(Qpv / Pcalc))
+            if Qpv < 0:
+                self.pf = -self.pf
+            self.__ControlledElm.SetParameter('pf', self.pf)
+        else:
+            dP = 0
+
+        Error = abs(dP)
+        self.oldPcalc = Ppv
+        # if Error > 0.1:
+        #     print((self.__Name, uIn, Qpv, Plim, Ppv, Pcalc, self.Pmppt, dP, self.pf))
+        return Error
+
+    def CutoffControl(self):
+        uIn = max(self.__ControlledElm.sBus[0].GetVariable('puVmagAngle')[::2])
+        uCut = self.__Settings['%UCutoff']
+        if uIn >= uCut:
+            self.__ControlledElm.SetParameter('pctPmpp', 0)
+            self.__ControlledElm.SetParameter('pf', 1)
+            if self.__vDisconnected:
+                return 0
+            else:
+                self.__vDisconnected = True
+                # print('Disconnecting {} at voltage {:.2f}'.format(self.__Name, uIn))
+                return self.__Prated
+
+        if self.TimeChange and self.__vDisconnected and uIn < uCut:
+            self.__ControlledElm.SetParameter('pctPmpp', self.Pmppt)
+            self.__ControlledElm.SetParameter('pf', self.pf)
+            self.__vDisconnected = False
+            # print('Reconnecting {} at voltage {:.2f}'.format(self.__Name, uIn))
+            return self.__Prated
+
+        return 0
+
+
+    def CPFcontrol(self):
+        PF = self.__Settings['pf']
+        self.__dssSolver.reSolve()
+
+        self.__ControlledElm.SetParameter('irradiance', 1)
+        self.__ControlledElm.SetParameter('pf', -PF)
+
+        Error = PF + float(self.__ControlledElm.GetParameter('pf'))
+
+        Pirr = float(self.__ControlledElm.GetParameter('irradiance'))
+        self.__ControlledElm.SetParameter('irradiance', Pirr * (1 + Error * 3))
+        self.__ControlledElm.SetParameter('pf', str(-PF))
+
+        return Error
+
+    def VPFcontrol(self):
+        Pmin = self.__Settings['Pmin']
+        Pmax = self.__Settings['Pmax']
+        PFmin = self.__Settings['pfMin']
+        PFmax = self.__Settings['pfMax']
+        self.__dssSolver.reSolve()
+        Pcalc = abs(sum(-(float(x)) for x in self.__ControlledElm.GetVariable('Powers')[0::2]) )/ self.__Srated
+        if Pcalc > 0:
+            if Pcalc < Pmin:
+                PF = PFmax
+            elif Pcalc > Pmax:
+                PF = PFmin
+            else:
+                m = (PFmax - PFmin) / (Pmin - Pmax)
+                c = (PFmin * Pmin - PFmax * Pmax) / (Pmin - Pmax)
+                PF = Pcalc * m + c
+        else:
+            PF = PFmax
+
+        self.__ControlledElm.SetParameter('irradiance', 1)
+        self.__ControlledElm.SetParameter('pf', str(-PF))
+        self.__dssSolver.reSolve()
+
+        for i in range(10):
+            Error = PF + float(self.__ControlledElm.GetParameter('pf'))
+            if abs(Error) < 1E-4:
+                break
+            Pirr = float(self.__ControlledElm.GetParameter('irradiance'))
+            self.__ControlledElm.SetParameter('pf', str(-PF))
+            self.__ControlledElm.SetParameter('irradiance', Pirr * (1 + Error*1.5))
+            self.__dssSolver.reSolve()
+
+        return 0
+
+    def VVARcontrol(self):
+        uMin = self.__Settings['uMin']
+        uMax = self.__Settings['uMax']
+        pfLim = self.__Settings['PFlim']
+        uDbMin = self.__Settings['uDbMin']
+        uDbMax = self.__Settings['uDbMax']
+        Priority = self.__Settings['Priority']
+
+        uIn = max(self.__ControlledElm.sBus[0].GetVariable('puVmagAngle')[::2])
+
+        m1 = self.QlimPU / (uMin - uDbMin)
+        m2 = self.QlimPU / (uDbMax - uMax)
+        c1 = self.QlimPU * uDbMin / (uDbMin - uMin)
+        c2 = self.QlimPU * uDbMax / (uMax - uDbMax)
+
+        Ppv = abs(sum(self.__ControlledElm.GetVariable('Powers')[::2]))
+        Pcalc = Ppv / self.__Srated
+        Qpv = -sum(self.__ControlledElm.GetVariable('Powers')[1::2])
+        Qpv = Qpv / self.__Srated
+
+        Qcalc = 0
+        if uIn <= uMin:
+            Qcalc = self.QlimPU
+        elif uIn <= uDbMin and uIn > uMin:
+            Qcalc = uIn * m1 + c1
+        elif uIn <= uDbMax and uIn > uDbMin:
+            Qcalc = 0
+        elif uIn <= uMax and uIn > uDbMax:
+            Qcalc = uIn * m2 + c2
+        elif uIn >= uMax:
+            Qcalc = -self.QlimPU
+
+        # adding heavy ball term to improve convergence
+        Qcalc = Qpv + (Qcalc - Qpv) * 0.5 / self.__dampCoef + (Qpv - self.oldQcalc) * 0.1 / self.__dampCoef
+        dQ = abs(Qcalc - Qpv)
+
+        if Priority == 'Var':
+            Plim = (1 - Qcalc ** 2) ** 0.5
+            # Pcalc = Pcalc + (Plim - Pcalc) * self.__Settings['qDampCoef']
+            # self.Pmppt = Pcalc / self.__Prated * self.__Srated * 100
+            if self.TimeChange:
+                self.Pmppt = 100
+            if Pcalc > Plim and self.TimeChange is False:
+                self.Pmppt = Plim / self.__Prated * self.__Srated * 100
+                Pcalc = Plim
+            self.__ControlledElm.SetParameter('pctPmpp', self.Pmppt)
+        else:
+            # no watt priority defined yet
+            pass
+
+        if Pcalc > 0:
+            self.pf = math.cos(math.atan(Qcalc / Pcalc))
+            if self.__Settings['Enable PF limit'] and abs(self.pf) < pfLim:
+                self.pf = pfLim
+            if Qcalc < 0:
+                self.pf = -self.pf
+            self.__ControlledElm.SetParameter('pf', self.pf)
+        else:
+            print('Warning: PV power is <0 and VVar controller is active.')
+            #print((self.__Name, uIn, Qcalc, Qpv, self.oldQcalc, dQ, Pcalc, self.pf))
+            # self.pf = 0
+            # dQ = 0 # forces VVarr off when PV is off, is that correct?
+
+
+        Error = abs(dQ)
+        # if Error > 0.1 or math.isnan(Error):
+        #     print((self.__Name, uIn, Qcalc, Qpv, self.oldQcalc, dQ, Pcalc, self.pf, self.__ControlledElm.GetVariable('Powers')))
+        self.oldQcalc = Qpv
+
+        return Error
diff --git a/build/lib/pyControllers/PvController.py b/build/lib/pyControllers/PvController.py
new file mode 100644
index 00000000..4310c4d0
--- /dev/null
+++ b/build/lib/pyControllers/PvController.py
@@ -0,0 +1,256 @@
+#import matplotlib.pyplot as plt
+import math
+
+class PvController:
+    TimeChange = False
+    Time = (-1, 0)
+
+    oldPcalc = 0
+    oldQcalc = 0
+    #dPOld = 0
+    #dQOld = 0
+
+    __vDisconnected = False
+    __pDisconnected = False
+
+    def __init__(self, PvObj, Settings, dssInstance, ElmObjectList, dssSolver):
+        self.__ElmObjectList = ElmObjectList
+        #print(PvObj.Bus[0] + ' - ' + PvObj.sBus[0].GetInfo())
+        self.ControlDict = {
+            'None'           : lambda: 0,
+            'CPF'            : self.CPFcontrol,
+            'VPF'            : self.VPFcontrol,
+            'VVar'           : self.VVARcontrol,
+            'VW'             : self.VWcontrol,
+            'Cutoff'         : self.CutoffControl,
+        }
+
+        self.__ControlledElm = PvObj
+        Class, Name = self.__ControlledElm.GetInfo()
+        self.__Name = 'pyCont_' + Class + '_' + Name
+        if '_' in Name:
+            self.Phase = Name.split('_')[1]
+        else:
+            self.Phase = None
+        self.__ElmObjectList = ElmObjectList
+        self.__ControlledElm = PvObj
+        self.__dssInstance = dssInstance
+        self.__dssSolver = dssSolver
+        self.__Settings = Settings
+
+        self.__BaseKV = float(PvObj.GetParameter('kv'))
+        self.__Srated = float(PvObj.GetParameter('kVA'))
+        self.__Prated = float(PvObj.GetParameter('Pmpp'))
+        self.__Qrated = float(PvObj.GetParameter('kVARlimit'))
+        self.__cutin = float(PvObj.SetParameter('%cutin', Settings['%PCutin'])) / 100
+        self.__cutout = float(PvObj.SetParameter('%cutout',Settings['%PCutout'])) / 100
+        self.__dampCoef = Settings['DampCoef']
+
+        self.__PFrated = Settings['PFlim']
+        self.Pmppt = 100
+        self.pf = 1
+
+        self.update = [self.ControlDict[Settings['Control' + str(i)]] for i in [1, 2, 3]]
+
+        self.QlimPU = self.__Qrated / self.__Srated if self.__Qrated < self.__Srated else 1
+        return
+
+    def Update(self, Priority, Time, Update):
+        self.TimeChange = self.Time != (Priority, Time)
+        self.Time = (Priority, Time)
+        Ppv = -sum(self.__ControlledElm.GetVariable('Powers')[::2]) / self.__Prated
+        if self.__pDisconnected:
+            if Ppv < self.__cutin:
+                return 0
+            else:
+                self.__pDisconnected = False
+        else:
+            if Ppv < self.__cutout:
+                self.__pDisconnected = True
+                self.__ControlledElm.SetParameter('pf', 1)
+                return 0
+        return self.update[Priority]()
+
+    def VWcontrol(self):
+        uMinC = self.__Settings['uMinC']
+        uMaxC = self.__Settings['uMaxC']
+        Pmin  = self.__Settings['PminVW'] / 100
+
+        uIn = max(self.__ControlledElm.sBus[0].GetVariable('puVmagAngle')[::2])
+        Ppv = -sum(self.__ControlledElm.GetVariable('Powers')[::2]) / self.__Srated
+        Qpv = -sum(self.__ControlledElm.GetVariable('Powers')[1::2]) / self.__Srated
+        #PpvoutPU = Ppv / self.__Prated
+
+        Plim = (1 - Qpv ** 2) ** 0.5 if self.__Settings['VWtype'] == 'Available Power' else 1
+        m = (1 - Pmin) / (uMinC - uMaxC)
+        #m = (Plim - Pmin) / (uMinC - uMaxC)
+        c = ((Pmin * uMinC) - uMaxC) / (uMinC - uMaxC)
+
+        if uIn < uMinC:
+            Pcalc = Plim
+        elif uIn < uMaxC and uIn > uMinC:
+            Pcalc = min(m * uIn + c, Plim)
+        else:
+            Pcalc = Pmin
+
+        if Ppv > Pcalc or (Ppv > 0 and self.Pmppt < 100):
+            # adding heavy ball term to improve convergence
+            dP = (Ppv - Pcalc) * 0.5 / self.__dampCoef + (self.oldPcalc - Ppv) * 0.1 / self.__dampCoef
+            Pcalc = Ppv - dP
+            self.Pmppt = min(self.Pmppt * Pcalc / Ppv, 100)
+            self.__ControlledElm.SetParameter('pctPmpp', self.Pmppt)
+            self.pf = math.cos(math.atan(Qpv / Pcalc))
+            if Qpv < 0:
+                self.pf = -self.pf
+            self.__ControlledElm.SetParameter('pf', self.pf)
+        else:
+            dP = 0
+
+        Error = abs(dP)
+        self.oldPcalc = Ppv
+        # if Error > 0.1:
+        #     print((self.__Name, uIn, Qpv, Plim, Ppv, Pcalc, self.Pmppt, dP, self.pf))
+        return Error
+
+    def CutoffControl(self):
+        uIn = max(self.__ControlledElm.sBus[0].GetVariable('puVmagAngle')[::2])
+        uCut = self.__Settings['%UCutoff']
+        if uIn >= uCut:
+            self.__ControlledElm.SetParameter('pctPmpp', 0)
+            self.__ControlledElm.SetParameter('pf', 1)
+            if self.__vDisconnected:
+                return 0
+            else:
+                self.__vDisconnected = True
+                # print('Disconnecting {} at voltage {:.2f}'.format(self.__Name, uIn))
+                return self.__Prated
+
+        if self.TimeChange and self.__vDisconnected and uIn < uCut:
+            self.__ControlledElm.SetParameter('pctPmpp', self.Pmppt)
+            self.__ControlledElm.SetParameter('pf', self.pf)
+            self.__vDisconnected = False
+            # print('Reconnecting {} at voltage {:.2f}'.format(self.__Name, uIn))
+            return self.__Prated
+
+        return 0
+
+
+    def CPFcontrol(self):
+        PF = self.__Settings['pf']
+        self.__dssSolver.reSolve()
+
+        self.__ControlledElm.SetParameter('irradiance', 1)
+        self.__ControlledElm.SetParameter('pf', -PF)
+
+        Error = PF + float(self.__ControlledElm.GetParameter('pf'))
+
+        Pirr = float(self.__ControlledElm.GetParameter('irradiance'))
+        self.__ControlledElm.SetParameter('irradiance', Pirr * (1 + Error * 3))
+        self.__ControlledElm.SetParameter('pf', str(-PF))
+
+        return Error
+
+    def VPFcontrol(self):
+        Pmin = self.__Settings['Pmin']
+        Pmax = self.__Settings['Pmax']
+        PFmin = self.__Settings['pfMin']
+        PFmax = self.__Settings['pfMax']
+        self.__dssSolver.reSolve()
+        Pcalc = abs(sum(-(float(x)) for x in self.__ControlledElm.GetVariable('Powers')[0::2]) )/ self.__Srated
+        if Pcalc > 0:
+            if Pcalc < Pmin:
+                PF = PFmax
+            elif Pcalc > Pmax:
+                PF = PFmin
+            else:
+                m = (PFmax - PFmin) / (Pmin - Pmax)
+                c = (PFmin * Pmin - PFmax * Pmax) / (Pmin - Pmax)
+                PF = Pcalc * m + c
+        else:
+            PF = PFmax
+
+        self.__ControlledElm.SetParameter('irradiance', 1)
+        self.__ControlledElm.SetParameter('pf', str(-PF))
+        self.__dssSolver.reSolve()
+
+        for i in range(10):
+            Error = PF + float(self.__ControlledElm.GetParameter('pf'))
+            if abs(Error) < 1E-4:
+                break
+            Pirr = float(self.__ControlledElm.GetParameter('irradiance'))
+            self.__ControlledElm.SetParameter('pf', str(-PF))
+            self.__ControlledElm.SetParameter('irradiance', Pirr * (1 + Error*1.5))
+            self.__dssSolver.reSolve()
+
+        return 0
+
+    def VVARcontrol(self):
+        uMin = self.__Settings['uMin']
+        uMax = self.__Settings['uMax']
+        pfLim = self.__Settings['PFlim']
+        uDbMin = self.__Settings['uDbMin']
+        uDbMax = self.__Settings['uDbMax']
+        Priority = self.__Settings['Priority']
+
+        uIn = max(self.__ControlledElm.sBus[0].GetVariable('puVmagAngle')[::2])
+
+        m1 = self.QlimPU / (uMin - uDbMin)
+        m2 = self.QlimPU / (uDbMax - uMax)
+        c1 = self.QlimPU * uDbMin / (uDbMin - uMin)
+        c2 = self.QlimPU * uDbMax / (uMax - uDbMax)
+
+        Ppv = abs(sum(self.__ControlledElm.GetVariable('Powers')[::2]))
+        Pcalc = Ppv / self.__Srated
+        Qpv = -sum(self.__ControlledElm.GetVariable('Powers')[1::2])
+        Qpv = Qpv / self.__Srated
+
+        Qcalc = 0
+        if uIn <= uMin:
+            Qcalc = self.QlimPU
+        elif uIn <= uDbMin and uIn > uMin:
+            Qcalc = uIn * m1 + c1
+        elif uIn <= uDbMax and uIn > uDbMin:
+            Qcalc = 0
+        elif uIn <= uMax and uIn > uDbMax:
+            Qcalc = uIn * m2 + c2
+        elif uIn >= uMax:
+            Qcalc = -self.QlimPU
+
+        # adding heavy ball term to improve convergence
+        Qcalc = Qpv + (Qcalc - Qpv) * 0.5 / self.__dampCoef + (Qpv - self.oldQcalc) * 0.1 / self.__dampCoef
+        dQ = abs(Qcalc - Qpv)
+
+        if Priority == 'Var':
+            Plim = (1 - Qcalc ** 2) ** 0.5
+            # Pcalc = Pcalc + (Plim - Pcalc) * self.__Settings['qDampCoef']
+            # self.Pmppt = Pcalc / self.__Prated * self.__Srated * 100
+            if self.TimeChange:
+                self.Pmppt = 100
+            if Pcalc > Plim and self.TimeChange is False:
+                self.Pmppt = Plim / self.__Prated * self.__Srated * 100
+                Pcalc = Plim
+            self.__ControlledElm.SetParameter('pctPmpp', self.Pmppt)
+        else:
+            # no watt priority defined yet
+            pass
+
+        if Pcalc > 0:
+            self.pf = math.cos(math.atan(Qcalc / Pcalc))
+            if self.__Settings['Enable PF limit'] and abs(self.pf) < pfLim:
+                self.pf = pfLim
+            if Qcalc < 0:
+                self.pf = -self.pf
+            self.__ControlledElm.SetParameter('pf', self.pf)
+        else:
+            print('Warning: PV power is <0 and VVar controller is active.')
+            print((self.__Name, uIn, Qcalc, Qpv, self.oldQcalc, dQ, Pcalc, self.pf))
+            # self.pf = 0
+            # dQ = 0 # forces VVarr off when PV is off, is that correct?
+
+
+        Error = abs(dQ)
+        # if Error > 0.1 or math.isnan(Error):
+        #     print((self.__Name, uIn, Qcalc, Qpv, self.oldQcalc, dQ, Pcalc, self.pf, self.__ControlledElm.GetVariable('Powers')))
+        self.oldQcalc = Qpv
+
+        return Error
diff --git a/build/lib/pyControllers/SocketController.py b/build/lib/pyControllers/SocketController.py
new file mode 100644
index 00000000..15f2980e
--- /dev/null
+++ b/build/lib/pyControllers/SocketController.py
@@ -0,0 +1,52 @@
+import socket
+import struct
+
+class SocketController:
+    Time = -1
+
+    def __init__(self, ElmObject, Settings, dssInstance, ElmObjectList,dssSolver):
+        self.__ControlledElm = ElmObject
+        Class, Name = self.__ControlledElm.GetInfo()
+        self.__Name = 'pyCont_' + Class + '_' + Name
+
+        self.IP = Settings['IP']
+        self.Port = Settings['Port']
+        self.Encoding = Settings['Encoding']
+        self.BufferSize = Settings['Buffer']
+        self.Index = Settings['Index'].split(',') if ',' in Settings['Index'] else [Settings['Index']]
+        self.Inputs = Settings['Inputs'].split(',') if ',' in Settings['Inputs'] else [Settings['Inputs']]
+        self.Outputs = Settings['Outputs'].split(',') if ',' in Settings['Outputs'] else [Settings['Outputs']]
+        self.Socket = self.__CreateClient()
+        return
+
+    def __CreateClient(self):
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)  # Create a socket object
+        s.connect((self.IP, self.Port))
+        return s
+
+    def Update(self, Priority, Time, UpdateResults):
+        # only update once?
+        self.TimeChange = self.Time != Time
+        self.Time = Time
+
+        if self.TimeChange:
+            Values = []
+            for Variable in self.Inputs:
+                Val =  self.__ControlledElm.GetValue(Variable)
+                if isinstance(Val, list):
+                    Values.extend(Val)
+                else:
+                    Values.extend([Val])
+            self.Socket.sendall(struct.pack('%sd' % len(Values), *Values))
+
+            Data = self.Socket.recv(self.BufferSize)
+            if Data:
+                numDoubles = int(len(Data) / 8)
+                tag = str(numDoubles) + 'd'
+                Data = list(struct.unpack(tag, Data))
+                print('Received --> ', Data)
+
+                for i, Variable in enumerate(self.Outputs):
+                    self.__ControlledElm.SetParameter(Variable, Data[0])
+
+        return 0
diff --git a/build/lib/pyControllers/StorageController.py b/build/lib/pyControllers/StorageController.py
new file mode 100644
index 00000000..ca93b5bd
--- /dev/null
+++ b/build/lib/pyControllers/StorageController.py
@@ -0,0 +1,400 @@
+import math
+
+class StorageController:
+    Time = -1
+
+    def __init__(self, StorageObj, Settings, dssInstance, ElmObjectList, dssSolver):
+        self.Time = (-1, 0)
+        self.__Pin = 0
+        self.Pbatt = 0
+        self.__PinOld = 0
+        self.PbattOld = 0
+        self.oldQcalc = 0
+        self.ExportOld = False
+        self.__ElmObjectList = ElmObjectList
+        self.ControlDict = {
+            'None' : lambda : 0,
+            'PS'   : self.PeakShavingControl,
+            'CF'   : self.CapacityFirmimgControl,
+            'TT'   : self.TimeTriggeredControl,
+            'RT'   : self.RealTimeControl,
+            'SH'   : self.ScheduledControl,
+            'NETT' : self.NonExportTimeTriggered,
+            'CPF'  : self.ConstantPowerFactorControl,
+            'VPF'  : self.VariablePowerFactorControl,
+            'VVar' : self.VoltVarControl,
+        }
+
+        self.__ElmObjectList = ElmObjectList
+        self.__ControlledElm = StorageObj
+        self.__dssInstance = dssInstance
+        self.__dssSolver = dssSolver
+        self.__Settings = Settings
+        self.__Srated = float(StorageObj.GetParameter('kVA'))
+        self.__Prated = float(StorageObj.GetParameter('kWrated'))
+        self.__Pbatt = float(StorageObj.GetParameter('kW'))
+        self.__dampCoef = Settings['DampCoef']
+        self.update = [self.ControlDict[Settings['Control' + str(i)]] for i in [1, 2, 3]]
+
+        Class, Name = self.__ControlledElm.GetInfo()
+        self.__Name = 'pyCont_' + Class + '_' + Name
+        #self.__Convergance = np.zeros((1440,10))
+        return
+
+    def Update(self, Priority, Time, Update):
+        self.TimeChange = self.Time != (Time, Priority)
+        self.Time = (Time, Priority)
+        return self.update[Priority]()
+
+    def SetSetting(self, Property, Value):
+        self.__Settings[Property] = Value
+        return
+
+    def GetSetting(self, Property):
+        return self.__Settings[Property]
+
+    def ScheduledControl(self):
+        P_profile = self.__Settings['Schedule']
+        Days = self.__Settings['Days']
+        LenSchedule = len(P_profile)
+        TotalSeconds = 24*60*60*Days
+        TimeStepPerSample = int(TotalSeconds / LenSchedule)
+
+        CurrentTime = int(self.__dssInstance.Solution.Hour()) * 60 * 60 + \
+                      int(self.__dssInstance.Solution.Seconds())
+
+        Index =  int(CurrentTime / TimeStepPerSample)
+        Pout = P_profile[Index]
+        if Pout > 0:
+            self.__ControlledElm.SetParameter('State', 'DISCHARGING')
+            self.__ControlledElm.SetParameter('%Discharge', str(Pout * 100))
+        elif Pout < 0:
+            self.__ControlledElm.SetParameter('State', 'CHARGING')
+            self.__ControlledElm.SetParameter('%charge', str(-Pout * 100))
+        else:
+            self.__ControlledElm.SetParameter('State', 'IDLE')
+        return 0
+
+    def NonExportTimeTriggered(self):
+        if self.__Settings['PowerMeaElem'] == 'Total':
+            Sin1 = self.__dssInstance.Circuit.TotalPower()
+            Pin1 = -sum(Sin1[::2])
+        else:
+            Sin1 = self.__ElmObjectList[self.__Settings['PowerMeaElem']].GetVariable('Powers')
+            Pin1 = sum(Sin1[::2])
+
+        if self.Time[0] == 0:
+            self.dummy = 1 if Pin1 > 0 else -1
+
+        Plb = self.__Settings['BaseLoadLim']
+        KWHrated = float(self.__ControlledElm.GetParameter('kWhrated'))
+        perIdle = float(self.__ControlledElm.GetParameter('%IdlingkW'))
+        effDchg = float(self.__ControlledElm.GetParameter('%EffDischarge'))
+        # perDischarge = self.__Settings['%DischargeRate']
+
+        sTime = self.__Settings['ExpWindowStart']
+        sTime = sTime.hour + sTime.minute / 60
+        eTime = self.__Settings['ExpWindowEnd']
+        eTime = eTime.hour + eTime.minute / 60
+
+        currTime = self.__dssInstance.Solution.Hour() % 24 + self.__dssInstance.Solution.Seconds() / 3600
+
+        if sTime < eTime:
+            Twindow = (eTime - sTime)
+            if currTime > sTime and currTime < eTime:
+                Export = True
+            else:
+                Export = False
+        else:
+            Twindow = 24 - (sTime - eTime)
+            if currTime > sTime or currTime < eTime:
+                Export = True
+            else:
+                Export = False
+
+        if self.ExportOld is False and Export is True:
+            perKWHstored = float(self.__ControlledElm.GetParameter('%stored'))
+            kWhrem = KWHrated * (perKWHstored / 100)
+            self.Pbatt = kWhrem / (Twindow) * effDchg / 100 - perIdle * self.__Prated / 100
+            # print(perKWHstored, kWhrem, self.Pbatt)
+        self.ExportOld = Export
+
+        if Export:
+            pctcharge = self.Pbatt / (self.__Prated) * 100
+            self.__ControlledElm.SetParameter('State', 'DISCHARGING')
+            self.__ControlledElm.SetParameter('%Discharge', str(pctcharge))
+            Error = 0
+        else:
+            if self.__Settings['PowerMeaElem'] == 'Total':
+                Sin = self.__dssInstance.Circuit.TotalPower()
+                Pin = -sum(Sin[::2])
+            else:
+                Sin = self.__ElmObjectList[self.__Settings['PowerMeaElem']].GetVariable('Powers')
+                Pin = self.dummy * sum(Sin[::2])
+
+            # Pbatt = -float(self.__ControlledElm.GetVariable('Powers')[0])*3 + IdlingkW
+            # #Does not work as well as KW parameter for some reason
+            Pbatt = float(self.__ControlledElm.GetParameter('kw'))
+            Pb0 = Pbatt
+            if Pin < Plb:
+                dP = Pin - Plb
+                Pbatt = Pbatt + dP
+            else:
+                dP = Pin - Plb
+                Pbatt = min(0, Pbatt + dP * self.__dampCoef)
+            if math.isnan(Pbatt) or Pbatt is None:
+                print('Error in Pbatt, data: {}'.format((Pbatt, Pin, dP, Plb, Pb0, self.dummy)))
+
+            if Pbatt >= 0:
+                pctdischarge = Pbatt / (self.__Prated) * 100
+                self.__ControlledElm.SetParameter('State', 'DISCHARGING')
+                self.__ControlledElm.SetParameter('%Discharge', str(pctdischarge))
+            if Pbatt < 0:
+                pctcharge = -Pbatt / (self.__Prated) * 100
+                self.__ControlledElm.SetParameter('State', 'CHARGING')
+                self.__ControlledElm.SetParameter('%charge', str(pctcharge))
+
+            Error = abs(Pbatt - self.PbattOld) / self.__Srated
+            self.PbattOld = Pbatt
+            # if Error > 0.2:
+            #     # print((self.__ControlledElm.GetInfo()[1], self.__Settings['PowerMeaElem'], Pin, Pb0, Pbatt))
+            #     print((self.__Name, currTime, Pbatt, self.PbattOld, Pin, Plb, dP, Pb0))
+        return Error
+
+    def PeakShavingControl(self):
+        Pub = self.__Settings['PS_ub']
+        Plb = self.__Settings['PS_lb']
+        IdlingkWPercent = float(self.__ControlledElm.GetParameter('%IdlingkW'))
+        IdlingkW = -IdlingkWPercent/100*self.__Prated
+        if self.__Settings['PowerMeaElem'] == 'Total':
+            Sin = self.__dssInstance.Circuit.TotalPower()
+            Pin = -sum(Sin[0:5:2])
+        else:
+            Sin = self.__ElmObjectList[self.__Settings['PowerMeaElem']].GetVariable('Powers')
+            Pin = sum(Sin[0:5:2])
+        #Pbatt = -float(self.__ControlledElm.GetVariable('Powers')[0])*3 + IdlingkW
+        #Does not work as well as KW parameter for come reason
+        Pbatt = float(self.__ControlledElm.GetParameter('kw'))
+        if Pin > Pub:
+            dP = Pin - Pub
+            Pbatt = Pbatt + dP * self.__dampCoef
+        elif Pin < Plb:
+            dP = Pin - Plb
+            Pbatt = Pbatt + dP * self.__dampCoef
+        else:
+            Pbatt = Pbatt
+
+        if Pbatt >= 0:
+            pctdischarge = min(100, Pbatt/ (self.__Prated)* 100)
+            self.__ControlledElm.SetParameter('State', 'DISCHARGING')
+            self.__ControlledElm.SetParameter('%Discharge', str(pctdischarge))
+
+        elif Pbatt < 0:
+            pctcharge = min(100, -Pbatt / (self.__Prated)* 100)
+            self.__ControlledElm.SetParameter('State', 'CHARGING')
+            self.__ControlledElm.SetParameter('%charge', str(pctcharge))
+
+        Error = abs(Pbatt - self.PbattOld) / self.__Srated
+        self.PbattOld = Pbatt
+        # if Error > 0.2:
+        #     print((self.__Name, Pbatt, self.PbattOld, self.__Prated, Pin, Plb, Pub, dP))
+        return Error
+
+    def RealTimeControl(self):
+        kWOut = self.__Settings['%kWOut']
+        if kWOut > 0:
+            self.__ControlledElm.SetParameter('State', 'DISCHARGING')
+            self.__ControlledElm.SetParameter('%Discharge', str(kWOut))
+        elif kWOut < 0:
+            self.__ControlledElm.SetParameter('State', 'CHARGING')
+            self.__ControlledElm.SetParameter('%charge', str(-kWOut))
+        else:
+            self.__ControlledElm.SetParameter('State', 'IDLE')
+        return 0
+
+    def TimeTriggeredControl(self):
+        HrCharge = self.__Settings['HrCharge']
+        HrDischarge = self.__Settings['HrDischarge']
+        rateCharge = self.__Settings['%rateCharge']
+        rateDischarge = self.__Settings['%rateDischarge']
+
+        HrC = int(HrCharge)
+        MnC = int((HrCharge - HrC) * 60)
+        HrD = int(HrDischarge)
+        MnD = int((HrDischarge - HrD) * 60)
+
+        Minutes = int(self.__dssInstance.Solution.Seconds()/60)
+        Hour = self.__dssInstance.Solution.Hour()
+        if Hour == HrC and Minutes == MnC:
+            self.__ControlledElm.SetParameter('State', 'CHARGING')
+            self.__ControlledElm.SetParameter('%charge', str(rateCharge))
+        elif Hour == HrD and Minutes == MnD:
+            self.__ControlledElm.SetParameter('State', 'DISCHARGING')
+            self.__ControlledElm.SetParameter('%Discharge', str(rateDischarge))
+        return 0
+
+    def CapacityFirmimgControl(self):
+        dPub = self.__Settings['CF_dP_ub']
+        dPlb = self.__Settings['CF_dP_lb']
+
+        if self.Time[0] == 0:
+            self.__PinOld = self.__Pin
+        #print(self.Time[0], self.__PinOld, self.__Pin)
+        if self.__Settings['PowerMeaElem'] == 'Total':
+            Sin = self.__dssInstance.Circuit.TotalPower()
+            Pin = -sum(Sin[0:5:2])
+        else:
+            Sin = self.__ElmObjectList[self.__Settings['PowerMeaElem']].GetVariable('Powers')
+            Pin = sum(Sin[0:5:2])
+        Pbatt = -float(self.__ControlledElm.GetVariable('Powers')[0]) * 3
+        ramp = (Pin - self.__PinOld)
+        if self.Time[0] > 1:
+            if ramp >= dPub:
+                dPbatt = self.__dampCoef * (ramp - dPub)
+                Pbatt += dPbatt
+            elif ramp <= dPlb:
+                dPbatt = self.__dampCoef * (ramp - dPlb)
+                Pbatt += dPbatt
+            else:
+                dPbatt = 0
+                Pbatt = 0
+            if Pbatt > 0:
+                pctdischarge = Pbatt / self.__Prated * 100
+                self.__ControlledElm.SetParameter('State', 'DISCHARGING')
+                self.__ControlledElm.SetParameter('%Discharge', str(pctdischarge))
+            elif Pbatt < 0:
+                pctcharge = -Pbatt / self.__Prated * 100
+                self.__ControlledElm.SetParameter('State', 'CHARGING')
+                self.__ControlledElm.SetParameter('%charge', str(pctcharge))
+            elif Pbatt == 0:
+                self.__ControlledElm.SetParameter('State', 'IDLING')
+            self.__Pin = Pin
+        else:
+            self.__PinOld = Pin
+            self.__Pin = Pin
+            return 0
+
+        Error = abs(dPbatt)
+        return Error
+
+    def ConstantPowerFactorControl(self):
+        PF = self.__Settings['pf']
+        self.__dssSolver.reSolve()
+        Pcalc = float(self.__ControlledElm.GetParameter('kw')) / self.__Prated
+
+        if Pcalc > 0:
+            Qcalc = float(self.__ControlledElm.GetParameter('kvar')) / self.__Prated
+
+            Scalc = (Pcalc ** 2 + Qcalc ** 2) ** (0.5)
+            if Scalc > 1:
+                Scaler = (1 - (Scalc - 1) / Scalc)
+                Pcalc = Pcalc * Scaler
+            if Pcalc > 0:
+                self.__ControlledElm.SetParameter('%Discharge', Pcalc * 100)
+            elif Pcalc < 0:
+                self.__ControlledElm.SetParameter('%charge', -Pcalc * 100)
+
+            self.__ControlledElm.SetParameter('pf', str(-PF))
+        else:
+            self.__ControlledElm.SetParameter('pf', str(1))
+
+        return 0
+
+    def VariablePowerFactorControl(self):
+        pMin = self.__Settings['Pmin']
+        pMax = self.__Settings['Pmax']
+        pfMin = self.__Settings['pfMin']
+        pfMax = self.__Settings['pfMax']
+
+        self.__dssSolver.reSolve()
+        Pcalc = float(self.__ControlledElm.GetParameter('kw')) / self.__Prated
+
+        if Pcalc > 0:
+            if Pcalc < pMin:
+                PF = pfMax
+            elif Pcalc > pMax:
+                PF = pfMin
+            else:
+                m = (pfMax - pfMin) / (pMin - pMax)
+                c = (pfMin * pMin - pfMax * pMax) / (pMin - pMax)
+                PF = Pcalc * m + c
+        else:
+            PF = pfMax
+        #print (Pcalc,PF)
+
+        Qcalc =  (Pcalc / PF) * math.sin(math.acos(PF))
+
+        Scalc = (Pcalc ** 2 + Qcalc ** 2) ** (0.5)
+        if Scalc > 1:
+            Scaler = (1 - (Scalc - 1) / Scalc)
+            Qcalc = Qcalc * Scaler
+            PF = math.cos(math.atan(Qcalc/Pcalc))
+
+        self.__ControlledElm.SetParameter('pf', str(-PF))
+        if Pcalc > 0:
+            self.__ControlledElm.SetParameter('%Discharge', Pcalc*100)
+        elif Pcalc < 0:
+            self.__ControlledElm.SetParameter('%charge', -Pcalc*100)
+        return 0
+
+    def VoltVarControl(self):
+
+        uMin = self.__Settings['uMin']
+        uMax = self.__Settings['uMax']
+        uDbMin = self.__Settings['uDbMin']
+        uDbMax = self.__Settings['uDbMax']
+        QlimPU = self.__Settings['QlimPU']
+        PFlim = self.__Settings['PFlim']
+
+        uIn = max(self.__ControlledElm.sBus[0].GetVariable('puVmagAngle')[::2])
+
+        m1 = QlimPU / (uMin-uDbMin)
+        m2 = QlimPU / (uDbMax-uMax)
+        c1 = QlimPU * uDbMin / (uDbMin-uMin)
+        c2 = QlimPU * uDbMax / (uMax-uDbMax)
+
+        Ppv = float(self.__ControlledElm.GetParameter('kw'))
+        Pcalc = Ppv / self.__Srated
+        Qpv = sum(self.__ControlledElm.GetVariable('Powers')[1::2])
+        Qpv = Qpv / self.__Srated
+
+        Qcalc = 0
+        if uIn <= uMin:
+            Qcalc = QlimPU
+        elif uIn <= uDbMin and uIn > uMin:
+            Qcalc = uIn * m1 + c1
+        elif uIn <= uDbMax and uIn > uDbMin:
+            Qcalc = 0
+        elif uIn <= uMax and uIn > uDbMax:
+            Qcalc = uIn * m2 + c2
+        elif uIn >= uMax:
+            Qcalc = -QlimPU
+
+        # adding heavy ball term to improve convergence
+        Qcalc = Qpv + (Qcalc - Qpv) * 0.5 / self.__dampCoef + (Qpv - self.oldQcalc) * 0.1 / self.__dampCoef
+        Qlim = (1 - Pcalc ** 2) ** 0.5 if abs(Pcalc) < 1 else 0 # note - this is watt priority
+        if self.__Settings['Enable PF limit']:
+            Qlim = min(Qlim, abs(Pcalc * math.tan(math.acos(PFlim))))
+        if abs(Qcalc) > Qlim:
+            Qcalc = Qlim if Qcalc > 0 else -Qlim
+
+        dQ = abs(Qcalc - Qpv)
+        pct = min((Qcalc**2 + Pcalc**2) ** 0.5 * self.__Srated / self.__Prated * 100, 100)
+        pf = math.cos(math.atan(Qcalc / Pcalc)) if Pcalc != 0 else 1
+        pf = -pf if Qcalc * Pcalc < 0 else pf
+        if Pcalc > 0:
+            self.__ControlledElm.SetParameter('pf', pf)
+            self.__ControlledElm.SetParameter('State', 'DISCHARGING')
+            self.__ControlledElm.SetParameter('%Discharge', str(pct))
+        elif Pcalc < 0:
+            self.__ControlledElm.SetParameter('pf', pf)
+            self.__ControlledElm.SetParameter('State', 'CHARGING')
+            self.__ControlledElm.SetParameter('%charge', str(pct))
+        else:
+            dQ = 0
+
+        Error = abs(dQ)
+        # if Error > 0.1 or math.isnan(Error):
+        #     print((self.__Name, uIn, Qcalc, Qpv, self.oldQcalc, dQ, Ppv, Pcalc, pct, pf, self.__ControlledElm.GetVariable('Powers')))
+        self.oldQcalc = Qcalc
+        return Error
diff --git a/build/lib/pyControllers/__init__.py b/build/lib/pyControllers/__init__.py
new file mode 100644
index 00000000..0a5a2957
--- /dev/null
+++ b/build/lib/pyControllers/__init__.py
@@ -0,0 +1 @@
+from . import pyController
diff --git a/build/lib/pyControllers/pyController.py b/build/lib/pyControllers/pyController.py
new file mode 100644
index 00000000..e944cd45
--- /dev/null
+++ b/build/lib/pyControllers/pyController.py
@@ -0,0 +1,26 @@
+from pyControllers import PvController, xfmrController, SocketController, StorageController, HybridController
+from PyDSS.dssElement import dssElement
+
+ControllerTypes = {
+    'PV Controller'     : PvController.PvController,
+    'Socket Controller' : SocketController.SocketController,
+    'XFMR Controller'   : xfmrController.xfmrController,
+    'Storage Controller': StorageController.StorageController,
+    'Hybrid Controller' : HybridController.HybridController
+}
+
+
+def Create(ElmName, ControllerType, Settings, ElmObjectList, dssInstance, dssSolver):
+    try:
+        print(ElmObjectList)
+        relObject = ElmObjectList[ElmName]
+    except:
+        Index = dssInstance.Circuit.SetActiveElement(ElmName)
+        if int(Index) >= 0:
+            ElmObjectList[ElmName] = dssElement(dssInstance)
+            relObject = ElmObjectList[ElmName]
+        else:
+            print('The controller dictionary does not contain ' + ControllerType)
+            return -1
+    ObjectController = ControllerTypes[ControllerType](relObject, Settings, dssInstance, ElmObjectList, dssSolver)
+    return ObjectController
diff --git a/build/lib/pyControllers/xfmrController.py b/build/lib/pyControllers/xfmrController.py
new file mode 100644
index 00000000..0efaac89
--- /dev/null
+++ b/build/lib/pyControllers/xfmrController.py
@@ -0,0 +1,39 @@
+
+class xfmrController:
+    P_old = 0
+    Time = -1
+
+    __Locked = False
+    def __init__(self, RegulatorObj, Settings, dssInstance, ElmObjectList, dssSolver):
+        self.__ControlledElm = RegulatorObj
+        self.__ConnTransformerName = 'Transformer.' + self.__ControlledElm.GetParameter('transformer').lower()
+        self.__ConnTransformer = ElmObjectList[self.__ConnTransformerName]
+        self.__ElmObjectList = ElmObjectList
+        self.__RPFlocking = Settings['RPF locking']
+        Class, Name = self.__ControlledElm.GetInfo()
+        self.__Name = 'pyCont_' + Class + '_' + Name
+        return
+
+    def Update(self, Priority, Time, UpdateResults):
+        Powers = self.__ConnTransformer.GetVariable('Powers')
+        Powers = Powers[:int(len(Powers)/2)][::2]
+        P_new = sum((float(x)) for x in Powers)
+        if self.__RPFlocking and self.P_old < 0:
+            self.__Locked = self.__EnableLock()
+        elif self.__RPFlocking and self.P_old > 0:
+            self.__Locked = self.__DisableLock()
+        else:
+           # self.__Locked = self.__EnableLock()
+            pass
+        self.P_old = P_new
+        return 0
+
+    def __EnableLock(self):
+        self.__ControlledElm.SetParameter('enabled','False')
+        return True
+
+    def __DisableLock(self):
+        self.__ControlledElm.SetParameter('enabled', 'True')
+        #self.__ControlledElm.SetParameter('enabled', 'False')
+        return False
+
diff --git a/dist/PyDSS-0.0.1-py3.6.egg b/dist/PyDSS-0.0.1-py3.6.egg
new file mode 100644
index 00000000..fcec4f71
Binary files /dev/null and b/dist/PyDSS-0.0.1-py3.6.egg differ