20 files changed, 1153 insertions, 533 deletions

diff --git a/Project/DataReport.cpp b/Project/DataReport.cpp
index 11b17e8..bcde093 100644
--- a/Project/DataReport.cpp
+++ b/Project/DataReport.cpp
@@ -13,6 +13,156 @@ DataReport::DataReport(wxWindow* parent, Workspace* workspace) : DataReportBase(
 }
 
 DataReport::~DataReport() {}
+void DataReport::CreateGrids()
+{
+    wxColour headerColour(200, 200, 200);
+    wxFont headerFont = m_gridPowerFlow->GetLabelFont();
+    headerFont.SetWeight(wxFONTWEIGHT_BOLD);
+
+    ElectricCalculation eCalc;
+    eCalc.GetElementsFromList(m_workspace->GetElementList());
+    auto lineList = eCalc.GetLineList();
+    auto transformerList = eCalc.GetTransformerList();
+    auto busList = eCalc.GetBusList();
+    auto generatorList = eCalc.GetSyncGeneratorList();
+
+    // Power Flow
+    // Header
+    m_gridPowerFlow->AppendCols(7);
+    m_gridPowerFlow->AppendRows();
+    m_gridPowerFlow->HideColLabels();
+    m_gridPowerFlow->HideRowLabels();
+    for(int i = 0; i < 7; ++i) {
+        m_gridPowerFlow->SetCellBackgroundColour(0, i, headerColour);
+        m_gridPowerFlow->SetCellFont(0, i, headerFont);
+    }
+    m_gridPowerFlow->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
+    // Values
+    m_gridPowerFlow->AppendRows((lineList.size() + transformerList.size()) * 2);
+    m_gridPowerFlow->AutoSize();
+
+    // Power Flow buses
+    // Header
+    m_gridPFBuses->AppendCols(6);
+    m_gridPFBuses->AppendRows();
+    m_gridPFBuses->HideColLabels();
+    m_gridPFBuses->HideRowLabels();
+    for(int i = 0; i < 6; ++i) {
+        m_gridPFBuses->SetCellBackgroundColour(0, i, headerColour);
+        m_gridPFBuses->SetCellFont(0, i, headerFont);
+    }
+    m_gridPFBuses->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
+    // Values
+    m_gridPFBuses->AppendRows(busList.size());
+    m_gridPFBuses->AutoSize();
+
+    // Power flow branches
+    // Header
+    m_gridPFBranches->AppendCols(10);
+    m_gridPFBranches->AppendRows(1);
+    m_gridPFBranches->HideColLabels();
+    m_gridPFBranches->HideRowLabels();
+    for(int i = 0; i < 10; ++i) {
+        m_gridPFBranches->SetCellBackgroundColour(0, i, headerColour);
+        m_gridPFBranches->SetCellFont(0, i, headerFont);
+    }
+    m_gridPFBranches->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
+    // Values
+    m_gridPFBranches->AppendRows(lineList.size() + transformerList.size());
+    m_gridPFBranches->AutoSize();
+
+    // Fault
+    // Header
+    m_gridFault->AppendCols(7);
+    m_gridFault->AppendRows(2);
+    m_gridFault->HideColLabels();
+    m_gridFault->HideRowLabels();
+    for(int i = 0; i < 2; ++i) {
+        for(int j = 0; j < 7; ++j) {
+            m_gridFault->SetCellBackgroundColour(i, j, headerColour);
+            m_gridFault->SetCellFont(i, j, headerFont);
+        }
+    }
+    m_gridFault->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
+    m_gridFault->SetCellSize(0, 0, 2, 1);
+    m_gridFault->SetCellSize(0, 1, 1, 2);
+    m_gridFault->SetCellSize(0, 3, 1, 2);
+    m_gridFault->SetCellSize(0, 5, 1, 2);
+    // Values
+    for(auto it = busList.begin(), itEnd = busList.end(); it != itEnd; ++it) {
+        Bus* bus = *it;
+        if(bus->GetElectricalData().hasFault) m_gridFault->AppendRows();
+    }
+    m_gridFault->AutoSize();
+
+    // Fault buses
+    // Header
+    m_gridFaultBuses->AppendCols(7);
+    m_gridFaultBuses->AppendRows(2);
+    m_gridFaultBuses->HideColLabels();
+    m_gridFaultBuses->HideRowLabels();
+    for(int i = 0; i < 2; ++i) {
+        for(int j = 0; j < 7; ++j) {
+            m_gridFaultBuses->SetCellBackgroundColour(i, j, headerColour);
+            m_gridFaultBuses->SetCellFont(i, j, headerFont);
+        }
+    }
+    m_gridFaultBuses->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
+    m_gridFaultBuses->SetCellSize(0, 0, 2, 1);
+    m_gridFaultBuses->SetCellSize(0, 1, 1, 2);
+    m_gridFaultBuses->SetCellSize(0, 3, 1, 2);
+    m_gridFaultBuses->SetCellSize(0, 5, 1, 2);
+    // Values
+    m_gridFaultBuses->AppendRows(busList.size());
+    m_gridFaultBuses->AutoSize();
+
+    // Fault branches
+    // Header
+    m_gridFaultBranches->AppendCols(11);
+    m_gridFaultBranches->AppendRows(2);
+    m_gridFaultBranches->HideColLabels();
+    m_gridFaultBranches->HideRowLabels();
+    for(int i = 0; i < 2; ++i) {
+        for(int j = 0; j < 11; ++j) {
+            m_gridFaultBranches->SetCellBackgroundColour(i, j, headerColour);
+            m_gridFaultBranches->SetCellFont(i, j, headerFont);
+        }
+    }
+    m_gridFaultBranches->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
+    m_gridFaultBranches->SetCellSize(0, 0, 2, 1);
+    m_gridFaultBranches->SetCellSize(0, 1, 2, 1);
+    m_gridFaultBranches->SetCellSize(0, 2, 2, 1);
+    m_gridFaultBranches->SetCellSize(0, 3, 2, 1);
+    m_gridFaultBranches->SetCellSize(0, 10, 2, 1);
+    m_gridFaultBranches->SetCellSize(0, 4, 1, 2);
+    m_gridFaultBranches->SetCellSize(0, 6, 1, 2);
+    m_gridFaultBranches->SetCellSize(0, 8, 1, 2);
+    // Values
+    m_gridFaultBranches->AppendRows((lineList.size() + transformerList.size()) * 2);
+    m_gridFaultBranches->AutoSize();
+
+    // Fault generators
+    // Header
+    m_gridFaultGenerators->AppendCols(7);
+    m_gridFaultGenerators->AppendRows(2);
+    m_gridFaultGenerators->HideColLabels();
+    m_gridFaultGenerators->HideRowLabels();
+    for(int i = 0; i < 2; ++i) {
+        for(int j = 0; j < 7; ++j) {
+            m_gridFaultGenerators->SetCellBackgroundColour(i, j, headerColour);
+            m_gridFaultGenerators->SetCellFont(i, j, headerFont);
+        }
+    }
+    m_gridFaultGenerators->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
+    m_gridFaultGenerators->SetCellSize(0, 0, 2, 1);
+    m_gridFaultGenerators->SetCellSize(0, 1, 1, 2);
+    m_gridFaultGenerators->SetCellSize(0, 3, 1, 2);
+    m_gridFaultGenerators->SetCellSize(0, 5, 1, 2);
+    // Values
+    m_gridFaultGenerators->AppendRows(generatorList.size());
+    m_gridFaultGenerators->AutoSize();
+}
+
 void DataReport::SetHeaders()
 {
     // Headers choices fill
@@ -41,6 +191,10 @@ void DataReport::SetHeaders()
     m_capSusceptanceChoices.Add(_("B (p.u.)"));
     m_capSusceptanceChoices.Add(_("B (S)"));
 
+    m_currentChoices.Add(_("Current (p.u.)"));
+    m_currentChoices.Add(_("Current (A)"));
+    m_currentChoices.Add(_("Current (kA)"));
+
     // Power flow
     m_gridPowerFlow->SetCellValue(0, 0, _("Type"));
     m_gridPowerFlow->SetCellValue(0, 1, _("Name"));
@@ -50,6 +204,7 @@ void DataReport::SetHeaders()
     m_gridPowerFlow->SetCellValue(0, 4, m_activePowerChoices[3]);
     m_gridPowerFlow->SetCellEditor(0, 5, new wxGridCellChoiceEditor(m_reactivePowerChoices));
     m_gridPowerFlow->SetCellValue(0, 5, m_reactivePowerChoices[3]);
+    m_gridPowerFlow->SetCellValue(0, 6, _("Online"));
 
     // Power flow buses
     m_gridPFBuses->SetCellValue(0, 0, _("Name"));
@@ -62,7 +217,7 @@ void DataReport::SetHeaders()
     m_gridPFBuses->SetCellEditor(0, 5, new wxGridCellChoiceEditor(m_reactivePowerChoices));
     m_gridPFBuses->SetCellValue(0, 5, m_reactivePowerChoices[3]);
 
-    // Power flow brances
+    // Power flow branches
     m_gridPFBranches->SetCellValue(0, 0, _("Type"));
     m_gridPFBranches->SetCellValue(0, 1, _("Name"));
     m_gridPFBranches->SetCellValue(0, 2, _("From"));
@@ -76,10 +231,76 @@ void DataReport::SetHeaders()
     m_gridPFBranches->SetCellValue(0, 7, _("TAP"));
     m_gridPFBranches->SetCellValue(0, 8, _("Phase Shift"));
     m_gridPFBranches->SetCellValue(0, 9, _("Online"));
+
+    // Fault
+    m_gridFault->SetCellValue(0, 0, _("Fault bus name"));
+    m_gridFault->SetCellValue(0, 1, _("Phase A"));
+    m_gridFault->SetCellValue(0, 3, _("Phase B"));
+    m_gridFault->SetCellValue(0, 5, _("Phase C"));
+    m_gridFault->SetCellEditor(1, 1, new wxGridCellChoiceEditor(m_currentChoices));
+    m_gridFault->SetCellValue(1, 1, m_currentChoices[1]);
+    m_gridFault->SetCellValue(1, 2, _("Angle"));
+    m_gridFault->SetCellEditor(1, 3, new wxGridCellChoiceEditor(m_currentChoices));
+    m_gridFault->SetCellValue(1, 3, m_currentChoices[1]);
+    m_gridFault->SetCellValue(1, 4, _("Angle"));
+    m_gridFault->SetCellEditor(1, 5, new wxGridCellChoiceEditor(m_currentChoices));
+    m_gridFault->SetCellValue(1, 5, m_currentChoices[1]);
+    m_gridFault->SetCellValue(1, 6, _("Angle"));
+
+    // Fault buses
+    m_gridFaultBuses->SetCellValue(0, 0, _("Name"));
+    m_gridFaultBuses->SetCellValue(0, 1, _("Phase A"));
+    m_gridFaultBuses->SetCellValue(0, 3, _("Phase B"));
+    m_gridFaultBuses->SetCellValue(0, 5, _("Phase C"));
+    m_gridFaultBuses->SetCellEditor(1, 1, new wxGridCellChoiceEditor(m_voltageChoices));
+    m_gridFaultBuses->SetCellValue(1, 1, m_voltageChoices[0]);
+    m_gridFaultBuses->SetCellValue(1, 2, _("Angle"));
+    m_gridFaultBuses->SetCellEditor(1, 3, new wxGridCellChoiceEditor(m_voltageChoices));
+    m_gridFaultBuses->SetCellValue(1, 3, m_voltageChoices[0]);
+    m_gridFaultBuses->SetCellValue(1, 4, _("Angle"));
+    m_gridFaultBuses->SetCellEditor(1, 5, new wxGridCellChoiceEditor(m_voltageChoices));
+    m_gridFaultBuses->SetCellValue(1, 5, m_voltageChoices[0]);
+    m_gridFaultBuses->SetCellValue(1, 6, _("Angle"));
+
+    // Fault branches
+    m_gridFaultBranches->SetCellValue(0, 0, _("Type"));
+    m_gridFaultBranches->SetCellValue(0, 1, _("Name"));
+    m_gridFaultBranches->SetCellValue(0, 2, _("From"));
+    m_gridFaultBranches->SetCellValue(0, 3, _("To"));
+    m_gridFaultBranches->SetCellValue(0, 4, _("Phase A"));
+    m_gridFaultBranches->SetCellValue(0, 6, _("Phase B"));
+    m_gridFaultBranches->SetCellValue(0, 8, _("Phase C"));
+    m_gridFaultBranches->SetCellValue(0, 10, _("Online"));
+    m_gridFaultBranches->SetCellEditor(1, 4, new wxGridCellChoiceEditor(m_currentChoices));
+    m_gridFaultBranches->SetCellValue(1, 4, m_currentChoices[1]);
+    m_gridFaultBranches->SetCellValue(1, 5, _("Angle"));
+    m_gridFaultBranches->SetCellEditor(1, 6, new wxGridCellChoiceEditor(m_currentChoices));
+    m_gridFaultBranches->SetCellValue(1, 6, m_currentChoices[1]);
+    m_gridFaultBranches->SetCellValue(1, 7, _("Angle"));
+    m_gridFaultBranches->SetCellEditor(1, 8, new wxGridCellChoiceEditor(m_currentChoices));
+    m_gridFaultBranches->SetCellValue(1, 8, m_currentChoices[1]);
+    m_gridFaultBranches->SetCellValue(1, 9, _("Angle"));
+
+    // Fault generators
+    m_gridFaultGenerators->SetCellValue(0, 0, _("Name"));
+    m_gridFaultGenerators->SetCellValue(0, 1, _("Phase A"));
+    m_gridFaultGenerators->SetCellValue(0, 3, _("Phase B"));
+    m_gridFaultGenerators->SetCellValue(0, 5, _("Phase C"));
+    m_gridFaultGenerators->SetCellEditor(1, 1, new wxGridCellChoiceEditor(m_currentChoices));
+    m_gridFaultGenerators->SetCellValue(1, 1, m_currentChoices[1]);
+    m_gridFaultGenerators->SetCellValue(1, 2, _("Angle"));
+    m_gridFaultGenerators->SetCellEditor(1, 3, new wxGridCellChoiceEditor(m_currentChoices));
+    m_gridFaultGenerators->SetCellValue(1, 3, m_currentChoices[1]);
+    m_gridFaultGenerators->SetCellValue(1, 4, _("Angle"));
+    m_gridFaultGenerators->SetCellEditor(1, 5, new wxGridCellChoiceEditor(m_currentChoices));
+    m_gridFaultGenerators->SetCellValue(1, 5, m_currentChoices[1]);
+    m_gridFaultGenerators->SetCellValue(1, 6, _("Angle"));
 }
 
 void DataReport::FillValues(GridSelection gridToFill)
 {
+    wxColour offlineColour(100, 100, 100);
+
     m_changingValues = true;
     ElectricCalculation eCalc;
     eCalc.GetElementsFromList(m_workspace->GetElementList());
@@ -121,62 +342,96 @@ void DataReport::FillValues(GridSelection gridToFill)
 
         for(auto it = lineList.begin(), itEnd = lineList.end(); it != itEnd; ++it) {
             Line* line = *it;
-            if(line->IsOnline()) {
-                auto data = line->GetElectricalData();
-
-                Bus* bus1 = static_cast<Bus*>(line->GetParentList()[0]);
-                Bus* bus2 = static_cast<Bus*>(line->GetParentList()[1]);
-
-                m_gridPowerFlow->SetCellValue(rowNumber, 0, _("Line"));
-                m_gridPowerFlow->SetCellValue(rowNumber, 1, data.name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 2, bus1->GetElectricalData().name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 3, bus2->GetElectricalData().name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 4,
-                                              line->StringFromDouble(std::real(data.powerFlow[0]) * kActivePower));
-                m_gridPowerFlow->SetCellValue(rowNumber, 5,
-                                              line->StringFromDouble(std::imag(data.powerFlow[0]) * kReactivePower));
-                rowNumber++;
 
-                m_gridPowerFlow->SetCellValue(rowNumber, 0, _("Line"));
-                m_gridPowerFlow->SetCellValue(rowNumber, 1, data.name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 2, bus2->GetElectricalData().name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 3, bus1->GetElectricalData().name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 4,
-                                              line->StringFromDouble(std::real(data.powerFlow[1]) * kActivePower));
-                m_gridPowerFlow->SetCellValue(rowNumber, 5,
-                                              line->StringFromDouble(std::imag(data.powerFlow[1]) * kReactivePower));
-                rowNumber++;
+            wxString busName1 = "-";
+            if(line->GetParentList()[0])
+                busName1 = static_cast<Bus*>(line->GetParentList()[0])->GetElectricalData().name;
+            wxString busName2 = "-";
+            if(line->GetParentList()[1])
+                busName2 = static_cast<Bus*>(line->GetParentList()[1])->GetElectricalData().name;
+
+            wxString isOnline = _("Yes");
+            wxColour textColour = m_gridPowerFlow->GetDefaultCellTextColour();
+            if(!line->IsOnline()) {
+                isOnline = _("No");
+                textColour = offlineColour;
+            }
+            for(int i = 0; i < 2; ++i) {
+                for(int j = 0; j < 7; ++j) {
+                    m_gridPowerFlow->SetCellTextColour(rowNumber + i, j, textColour);
+                }
             }
+
+            m_gridPowerFlow->SetCellValue(rowNumber, 9, isOnline);
+            auto data = line->GetPUElectricalData(basePower);
+
+            m_gridPowerFlow->SetCellValue(rowNumber, 0, _("Line"));
+            m_gridPowerFlow->SetCellValue(rowNumber, 1, data.name);
+            m_gridPowerFlow->SetCellValue(rowNumber, 2, busName1);
+            m_gridPowerFlow->SetCellValue(rowNumber, 3, busName2);
+            m_gridPowerFlow->SetCellValue(rowNumber, 4,
+                                          line->StringFromDouble(std::real(data.powerFlow[0]) * kActivePower));
+            m_gridPowerFlow->SetCellValue(rowNumber, 5,
+                                          line->StringFromDouble(std::imag(data.powerFlow[0]) * kReactivePower));
+            m_gridPowerFlow->SetCellValue(rowNumber, 6, isOnline);
+            rowNumber++;
+
+            m_gridPowerFlow->SetCellValue(rowNumber, 0, _("Line"));
+            m_gridPowerFlow->SetCellValue(rowNumber, 1, data.name);
+            m_gridPowerFlow->SetCellValue(rowNumber, 2, busName2);
+            m_gridPowerFlow->SetCellValue(rowNumber, 3, busName1);
+            m_gridPowerFlow->SetCellValue(rowNumber, 4,
+                                          line->StringFromDouble(std::real(data.powerFlow[1]) * kActivePower));
+            m_gridPowerFlow->SetCellValue(rowNumber, 5,
+                                          line->StringFromDouble(std::imag(data.powerFlow[1]) * kReactivePower));
+            m_gridPowerFlow->SetCellValue(rowNumber, 6, isOnline);
+            rowNumber++;
         }
 
         for(auto it = transformerList.begin(), itEnd = transformerList.end(); it != itEnd; ++it) {
             Transformer* transformer = *it;
-            if(transformer->IsOnline()) {
-                auto data = transformer->GetElectricalData();
-
-                Bus* bus1 = static_cast<Bus*>(transformer->GetParentList()[0]);
-                Bus* bus2 = static_cast<Bus*>(transformer->GetParentList()[1]);
-
-                m_gridPowerFlow->SetCellValue(rowNumber, 0, _("Transformer"));
-                m_gridPowerFlow->SetCellValue(rowNumber, 1, data.name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 2, bus1->GetElectricalData().name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 3, bus2->GetElectricalData().name);
-                m_gridPowerFlow->SetCellValue(
-                    rowNumber, 4, transformer->StringFromDouble(std::real(data.powerFlow[0]) * kActivePower));
-                m_gridPowerFlow->SetCellValue(
-                    rowNumber, 5, transformer->StringFromDouble(std::imag(data.powerFlow[0]) * kReactivePower));
-                rowNumber++;
+            auto data = transformer->GetPUElectricalData(basePower);
 
-                m_gridPowerFlow->SetCellValue(rowNumber, 0, _("Transformer"));
-                m_gridPowerFlow->SetCellValue(rowNumber, 1, data.name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 2, bus2->GetElectricalData().name);
-                m_gridPowerFlow->SetCellValue(rowNumber, 3, bus1->GetElectricalData().name);
-                m_gridPowerFlow->SetCellValue(
-                    rowNumber, 4, transformer->StringFromDouble(std::real(data.powerFlow[1]) * kActivePower));
-                m_gridPowerFlow->SetCellValue(
-                    rowNumber, 5, transformer->StringFromDouble(std::imag(data.powerFlow[1]) * kReactivePower));
-                rowNumber++;
+            wxString busName1 = "-";
+            if(transformer->GetParentList()[0])
+                busName1 = static_cast<Bus*>(transformer->GetParentList()[0])->GetElectricalData().name;
+            wxString busName2 = "-";
+            if(transformer->GetParentList()[1])
+                busName2 = static_cast<Bus*>(transformer->GetParentList()[1])->GetElectricalData().name;
+
+            wxString isOnline = _("Yes");
+            wxColour textColour = m_gridPowerFlow->GetDefaultCellTextColour();
+            if(!transformer->IsOnline()) {
+                isOnline = _("No");
+                textColour = offlineColour;
             }
+            for(int i = 0; i < 2; ++i) {
+                for(int j = 0; j < 7; ++j) {
+                    m_gridPowerFlow->SetCellTextColour(rowNumber + i, j, textColour);
+                }
+            }
+
+            m_gridPowerFlow->SetCellValue(rowNumber, 0, _("Transformer"));
+            m_gridPowerFlow->SetCellValue(rowNumber, 1, data.name);
+            m_gridPowerFlow->SetCellValue(rowNumber, 2, busName1);
+            m_gridPowerFlow->SetCellValue(rowNumber, 3, busName2);
+            m_gridPowerFlow->SetCellValue(rowNumber, 4,
+                                          transformer->StringFromDouble(std::real(data.powerFlow[0]) * kActivePower));
+            m_gridPowerFlow->SetCellValue(rowNumber, 5,
+                                          transformer->StringFromDouble(std::imag(data.powerFlow[0]) * kReactivePower));
+            m_gridPowerFlow->SetCellValue(rowNumber, 6, isOnline);
+            rowNumber++;
+
+            m_gridPowerFlow->SetCellValue(rowNumber, 0, _("Transformer"));
+            m_gridPowerFlow->SetCellValue(rowNumber, 1, data.name);
+            m_gridPowerFlow->SetCellValue(rowNumber, 2, busName2);
+            m_gridPowerFlow->SetCellValue(rowNumber, 3, busName1);
+            m_gridPowerFlow->SetCellValue(rowNumber, 4,
+                                          transformer->StringFromDouble(std::real(data.powerFlow[1]) * kActivePower));
+            m_gridPowerFlow->SetCellValue(rowNumber, 5,
+                                          transformer->StringFromDouble(std::imag(data.powerFlow[1]) * kReactivePower));
+            m_gridPowerFlow->SetCellValue(rowNumber, 6, isOnline);
+            rowNumber++;
         }
         m_gridPowerFlow->AutoSize();
     }
@@ -246,15 +501,25 @@ void DataReport::FillValues(GridSelection gridToFill)
             if(data.nominalVoltageUnit == UNIT_kV) vb *= 1e3;
             double zb = (vb * vb) / basePower;
 
-            m_gridPFBranches->SetCellValue(rowNumber, 0, _("Line"));
-            m_gridPFBranches->SetCellValue(rowNumber, 1, data.name);
-
             wxString busName1 = "-";
             if(line->GetParentList()[0])
                 busName1 = static_cast<Bus*>(line->GetParentList()[0])->GetElectricalData().name;
             wxString busName2 = "-";
             if(line->GetParentList()[1])
                 busName2 = static_cast<Bus*>(line->GetParentList()[1])->GetElectricalData().name;
+            wxString isOnline = _("Yes");
+            wxColour textColour = m_gridPFBranches->GetDefaultCellTextColour();
+            if(!line->IsOnline()) {
+                isOnline = _("No");
+                textColour = offlineColour;
+            }
+            for(int j = 0; j < 10; ++j) {
+                m_gridPFBranches->SetCellTextColour(rowNumber, j, textColour);
+            }
+
+            m_gridPFBranches->SetCellValue(rowNumber, 0, _("Line"));
+            m_gridPFBranches->SetCellValue(rowNumber, 1, data.name);
+
             m_gridPFBranches->SetCellValue(rowNumber, 2, busName1);
             m_gridPFBranches->SetCellValue(rowNumber, 3, busName2);
 
@@ -269,9 +534,6 @@ void DataReport::FillValues(GridSelection gridToFill)
             m_gridPFBranches->SetCellValue(rowNumber, 6, line->StringFromDouble(data.capSusceptance / k));
             m_gridPFBranches->SetCellValue(rowNumber, 7, "-");
             m_gridPFBranches->SetCellValue(rowNumber, 8, "-");
-
-            wxString isOnline = _("Yes");
-            if(!line->IsOnline()) isOnline = _("No");
             m_gridPFBranches->SetCellValue(rowNumber, 9, isOnline);
             rowNumber++;
         }
@@ -289,15 +551,25 @@ void DataReport::FillValues(GridSelection gridToFill)
             }
             double zb = (vb * vb) / basePower;
 
-            m_gridPFBranches->SetCellValue(rowNumber, 0, _("Transformer"));
-            m_gridPFBranches->SetCellValue(rowNumber, 1, data.name);
-
             wxString busName1 = "-";
             if(transformer->GetParentList()[0])
                 busName1 = static_cast<Bus*>(transformer->GetParentList()[0])->GetElectricalData().name;
             wxString busName2 = "-";
             if(transformer->GetParentList()[1])
                 busName2 = static_cast<Bus*>(transformer->GetParentList()[1])->GetElectricalData().name;
+
+            wxString isOnline = _("Yes");
+            wxColour textColour = m_gridPFBranches->GetDefaultCellTextColour();
+            if(!transformer->IsOnline()) {
+                isOnline = _("No");
+                textColour = offlineColour;
+            }
+            for(int j = 0; j < 10; ++j) {
+                m_gridPFBranches->SetCellTextColour(rowNumber, j, textColour);
+            }
+
+            m_gridPFBranches->SetCellValue(rowNumber, 0, _("Transformer"));
+            m_gridPFBranches->SetCellValue(rowNumber, 1, data.name);
             m_gridPFBranches->SetCellValue(rowNumber, 2, busName1);
             m_gridPFBranches->SetCellValue(rowNumber, 3, busName2);
 
@@ -310,85 +582,325 @@ void DataReport::FillValues(GridSelection gridToFill)
             m_gridPFBranches->SetCellValue(rowNumber, 6, "-");
             m_gridPFBranches->SetCellValue(rowNumber, 7, transformer->StringFromDouble(data.turnsRatio));
             m_gridPFBranches->SetCellValue(rowNumber, 8, transformer->StringFromDouble(data.phaseShift));
-
-            wxString isOnline = _("Yes");
-            if(!transformer->IsOnline()) isOnline = _("No");
             m_gridPFBranches->SetCellValue(rowNumber, 9, isOnline);
             rowNumber++;
         }
         m_gridPFBranches->AutoSize();
     }
 
-    m_changingValues = false;
-}
+    // Fault
+    if(gridToFill == GRID_ALL || gridToFill == GRID_FAULT) {
+        rowNumber = 2;
+        for(auto it = busList.begin(), itEnd = busList.end(); it != itEnd; ++it) {
+            Bus* bus = *it;
+            auto data = bus->GetElectricalData();
+            if(data.hasFault) {
+                double vb = bus->GetValueFromUnit(data.nominalVoltage, data.nominalVoltageUnit);
+                double ib = basePower / vb;
+
+                m_gridFault->SetCellValue(rowNumber, 0, data.name);
+
+                double kCurrent = 1.0;
+                if(m_gridFault->GetCellValue(1, 1) == m_currentChoices[1]) {
+                    kCurrent = ib;
+                } else if(m_gridFault->GetCellValue(1, 1) == m_currentChoices[2]) {
+                    kCurrent = ib / 1e3;
+                }
+                m_gridFault->SetCellValue(rowNumber, 1,
+                                          bus->StringFromDouble(std::abs(data.faultCurrent[0]) * kCurrent));
+
+                m_gridFault->SetCellValue(rowNumber, 2,
+                                          bus->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[0]))));
+
+                kCurrent = 1.0;
+                if(m_gridFault->GetCellValue(1, 3) == m_currentChoices[1]) {
+                    kCurrent = ib;
+                } else if(m_gridFault->GetCellValue(1, 3) == m_currentChoices[2]) {
+                    kCurrent = ib / 1e3;
+                }
+                m_gridFault->SetCellValue(rowNumber, 3,
+                                          bus->StringFromDouble(std::abs(data.faultCurrent[1]) * kCurrent));
+
+                m_gridFault->SetCellValue(rowNumber, 4,
+                                          bus->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[1]))));
+
+                kCurrent = 1.0;
+                if(m_gridFault->GetCellValue(1, 5) == m_currentChoices[1]) {
+                    kCurrent = ib;
+                } else if(m_gridFault->GetCellValue(1, 5) == m_currentChoices[2]) {
+                    kCurrent = ib / 1e3;
+                }
+                m_gridFault->SetCellValue(rowNumber, 5,
+                                          bus->StringFromDouble(std::abs(data.faultCurrent[2]) * kCurrent));
+
+                m_gridFault->SetCellValue(rowNumber, 6,
+                                          bus->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[2]))));
 
-void DataReport::CreateGrids()
-{
-    wxColour headerColour(200, 200, 200);
-    wxFont headerFont = m_gridPowerFlow->GetLabelFont();
-    headerFont.SetWeight(wxFONTWEIGHT_BOLD);
+                rowNumber++;
+            }
+        }
+        m_gridFault->AutoSize();
+    }
 
-    ElectricCalculation eCalc;
-    eCalc.GetElementsFromList(m_workspace->GetElementList());
+    // Fault buses
+    if(gridToFill == GRID_ALL || gridToFill == GRID_FAULTBUSES) {
+        rowNumber = 2;
+        for(auto it = busList.begin(), itEnd = busList.end(); it != itEnd; ++it) {
+            Bus* bus = *it;
+            auto data = bus->GetElectricalData();
+            double vb = bus->GetValueFromUnit(data.nominalVoltage, data.nominalVoltageUnit);
 
-    // Power Flow
-    // Header
-    m_gridPowerFlow->AppendCols(6);
-    m_gridPowerFlow->AppendRows();
-    m_gridPowerFlow->HideColLabels();
-    m_gridPowerFlow->HideRowLabels();
-    for(int i = 0; i < 6; ++i) {
-        m_gridPowerFlow->SetCellBackgroundColour(0, i, headerColour);
-        m_gridPowerFlow->SetCellFont(0, i, headerFont);
-    }
-    m_gridPowerFlow->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
-    // Values
-    auto lineList = eCalc.GetLineList();
-    for(auto it = lineList.begin(), itEnd = lineList.end(); it != itEnd; ++it) {
-        Line* line = *it;
-        if(line->IsOnline()) {
-            m_gridPowerFlow->AppendRows(2);
+            m_gridFaultBuses->SetCellValue(rowNumber, 0, data.name);
+            double kVoltage = 1.0;
+            if(m_gridFaultBuses->GetCellValue(1, 1) == m_voltageChoices[1]) {
+                kVoltage = vb;
+            } else if(m_gridFaultBuses->GetCellValue(1, 1) == m_voltageChoices[2]) {
+                kVoltage = vb / 1e3;
+            }
+            m_gridFaultBuses->SetCellValue(rowNumber, 1,
+                                           bus->StringFromDouble(std::abs(data.faultVoltage[0]) * kVoltage));
+            m_gridFaultBuses->SetCellValue(rowNumber, 2,
+                                           bus->StringFromDouble(wxRadToDeg(std::arg(data.faultVoltage[0]))));
+
+            kVoltage = 1.0;
+            if(m_gridFaultBuses->GetCellValue(1, 3) == m_voltageChoices[1]) {
+                kVoltage = vb;
+            } else if(m_gridFaultBuses->GetCellValue(1, 3) == m_voltageChoices[2]) {
+                kVoltage = vb / 1e3;
+            }
+            m_gridFaultBuses->SetCellValue(rowNumber, 3,
+                                           bus->StringFromDouble(std::abs(data.faultVoltage[1]) * kVoltage));
+            m_gridFaultBuses->SetCellValue(rowNumber, 4,
+                                           bus->StringFromDouble(wxRadToDeg(std::arg(data.faultVoltage[1]))));
+
+            kVoltage = 1.0;
+            if(m_gridFaultBuses->GetCellValue(1, 5) == m_voltageChoices[1]) {
+                kVoltage = vb;
+            } else if(m_gridFaultBuses->GetCellValue(1, 5) == m_voltageChoices[2]) {
+                kVoltage = vb / 1e3;
+            }
+            m_gridFaultBuses->SetCellValue(rowNumber, 5,
+                                           bus->StringFromDouble(std::abs(data.faultVoltage[2]) * kVoltage));
+            m_gridFaultBuses->SetCellValue(rowNumber, 6,
+                                           bus->StringFromDouble(wxRadToDeg(std::arg(data.faultVoltage[2]))));
+
+            rowNumber++;
         }
+        m_gridFaultBuses->AutoSize();
     }
-    auto transformerList = eCalc.GetTransformerList();
-    for(auto it = transformerList.begin(), itEnd = transformerList.end(); it != itEnd; ++it) {
-        Transformer* transformer = *it;
-        if(transformer->IsOnline()) {
-            m_gridPowerFlow->AppendRows(2);
+
+    // Fault branches
+    if(gridToFill == GRID_ALL || gridToFill == GRID_FAULTBRANCHES) {
+        rowNumber = 2;
+        for(auto it = lineList.begin(), itEnd = lineList.end(); it != itEnd; ++it) {
+            Line* line = *it;
+            auto data = line->GetPUElectricalData(basePower);
+
+            double vb = line->GetValueFromUnit(data.nominalVoltage, data.nominalVoltageUnit);
+            double ib = basePower / vb;
+
+            wxString busName1 = "-";
+            if(line->GetParentList()[0])
+                busName1 = static_cast<Bus*>(line->GetParentList()[0])->GetElectricalData().name;
+            wxString busName2 = "-";
+            if(line->GetParentList()[1])
+                busName2 = static_cast<Bus*>(line->GetParentList()[1])->GetElectricalData().name;
+
+            wxString isOnline = _("Yes");
+            wxColour textColour = m_gridFaultBranches->GetDefaultCellTextColour();
+            if(!line->IsOnline()) {
+                isOnline = _("No");
+                textColour = offlineColour;
+            }
+            for(int i = 0; i < 2; ++i) {
+                for(int j = 0; j < 11; ++j) {
+                    m_gridFaultBranches->SetCellTextColour(rowNumber + i, j, textColour);
+                }
+            }
+
+            m_gridFaultBranches->SetCellValue(rowNumber, 0, _("Line"));
+            m_gridFaultBranches->SetCellValue(rowNumber, 1, data.name);
+            m_gridFaultBranches->SetCellValue(rowNumber, 2, busName1);
+            m_gridFaultBranches->SetCellValue(rowNumber, 3, busName2);
+
+            double kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 4) == m_currentChoices[1]) {
+                kCurrent = ib;
+            } else if(m_gridFaultBranches->GetCellValue(1, 4) == m_currentChoices[2]) {
+                kCurrent = ib / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(rowNumber, 4,
+                                              line->StringFromDouble(std::abs(data.faultCurrent[0][0]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(rowNumber, 5,
+                                              line->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[0][0]))));
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 6) == m_currentChoices[1]) {
+                kCurrent = ib;
+            } else if(m_gridFaultBranches->GetCellValue(1, 6) == m_currentChoices[2]) {
+                kCurrent = ib / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(rowNumber, 6,
+                                              line->StringFromDouble(std::abs(data.faultCurrent[0][1]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(rowNumber, 7,
+                                              line->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[0][1]))));
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 8) == m_currentChoices[1]) {
+                kCurrent = ib;
+            } else if(m_gridFaultBranches->GetCellValue(1, 8) == m_currentChoices[2]) {
+                kCurrent = ib / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(rowNumber, 8,
+                                              line->StringFromDouble(std::abs(data.faultCurrent[0][2]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(rowNumber, 9,
+                                              line->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[0][2]))));
+            m_gridFaultBranches->SetCellValue(rowNumber, 10, isOnline);
+            rowNumber++;
+
+            m_gridFaultBranches->SetCellValue(rowNumber, 0, _("Line"));
+            m_gridFaultBranches->SetCellValue(rowNumber, 1, data.name);
+            m_gridFaultBranches->SetCellValue(rowNumber, 2, busName2);
+            m_gridFaultBranches->SetCellValue(rowNumber, 3, busName1);
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 4) == m_currentChoices[1]) {
+                kCurrent = ib;
+            } else if(m_gridFaultBranches->GetCellValue(1, 4) == m_currentChoices[2]) {
+                kCurrent = ib / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(rowNumber, 4,
+                                              line->StringFromDouble(std::abs(data.faultCurrent[1][0]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(rowNumber, 5,
+                                              line->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[1][0]))));
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 6) == m_currentChoices[1]) {
+                kCurrent = ib;
+            } else if(m_gridFaultBranches->GetCellValue(1, 6) == m_currentChoices[2]) {
+                kCurrent = ib / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(rowNumber, 6,
+                                              line->StringFromDouble(std::abs(data.faultCurrent[1][1]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(rowNumber, 7,
+                                              line->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[1][1]))));
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 8) == m_currentChoices[1]) {
+                kCurrent = ib;
+            } else if(m_gridFaultBranches->GetCellValue(1, 8) == m_currentChoices[2]) {
+                kCurrent = ib / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(rowNumber, 8,
+                                              line->StringFromDouble(std::abs(data.faultCurrent[1][2]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(rowNumber, 9,
+                                              line->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[1][2]))));
+            m_gridFaultBranches->SetCellValue(rowNumber, 10, isOnline);
+            rowNumber++;
         }
-    }
-    m_gridPowerFlow->AutoSize();
 
-    // Power Flow buses
-    // Header
-    m_gridPFBuses->AppendCols(6);
-    m_gridPFBuses->AppendRows();
-    m_gridPFBuses->HideColLabels();
-    m_gridPFBuses->HideRowLabels();
-    for(int i = 0; i < 6; ++i) {
-        m_gridPFBuses->SetCellBackgroundColour(0, i, headerColour);
-        m_gridPFBuses->SetCellFont(0, i, headerFont);
-    }
-    m_gridPFBuses->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
-    // Values
-    auto busList = eCalc.GetBusList();
-    m_gridPFBuses->AppendRows(busList.size());
-    m_gridPFBuses->AutoSize();
+        for(auto it = transformerList.begin(), itEnd = transformerList.end(); it != itEnd; ++it) {
+            Transformer* transformer = *it;
+            auto data = transformer->GetPUElectricalData(basePower);
 
-    // Power flow branches
-    // Header
-    m_gridPFBranches->AppendCols(10);
-    m_gridPFBranches->AppendRows(1);
-    m_gridPFBranches->HideColLabels();
-    m_gridPFBranches->HideRowLabels();
-    for(int i = 0; i < 10; ++i) {
-        m_gridPFBranches->SetCellBackgroundColour(0, i, headerColour);
-        m_gridPFBranches->SetCellFont(0, i, headerFont);
+            double vb = transformer->GetValueFromUnit(data.primaryNominalVoltage, data.primaryNominalVoltageUnit);
+            double ibp = basePower / vb;
+            vb = transformer->GetValueFromUnit(data.secondaryNominalVoltage, data.secondaryNominalVoltageUnit);
+            double ibs = basePower / vb;
+
+            wxString busName1 = "-";
+            if(transformer->GetParentList()[0])
+                busName1 = static_cast<Bus*>(transformer->GetParentList()[0])->GetElectricalData().name;
+            wxString busName2 = "-";
+            if(transformer->GetParentList()[1])
+                busName2 = static_cast<Bus*>(transformer->GetParentList()[1])->GetElectricalData().name;
+
+            wxString isOnline = _("Yes");
+            wxColour textColour = m_gridFaultBranches->GetDefaultCellTextColour();
+            if(!transformer->IsOnline()) {
+                isOnline = _("No");
+                textColour = offlineColour;
+            }
+            for(int i = 0; i < 2; ++i) {
+                for(int j = 0; j < 11; ++j) {
+                    m_gridFaultBranches->SetCellTextColour(rowNumber + i, j, textColour);
+                }
+            }
+
+            m_gridFaultBranches->SetCellValue(rowNumber, 0, _("Transformer"));
+            m_gridFaultBranches->SetCellValue(rowNumber, 1, data.name);
+            m_gridFaultBranches->SetCellValue(rowNumber, 2, busName1);
+            m_gridFaultBranches->SetCellValue(rowNumber, 3, busName2);
+
+            double kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 4) == m_currentChoices[1]) {
+                kCurrent = ibp;
+            } else if(m_gridFaultBranches->GetCellValue(1, 4) == m_currentChoices[2]) {
+                kCurrent = ibp / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 4, transformer->StringFromDouble(std::abs(data.faultCurrent[0][0]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 5, transformer->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[0][0]))));
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 6) == m_currentChoices[1]) {
+                kCurrent = ibp;
+            } else if(m_gridFaultBranches->GetCellValue(1, 6) == m_currentChoices[2]) {
+                kCurrent = ibp / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 6, transformer->StringFromDouble(std::abs(data.faultCurrent[0][1]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 7, transformer->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[0][1]))));
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 8) == m_currentChoices[1]) {
+                kCurrent = ibp;
+            } else if(m_gridFaultBranches->GetCellValue(1, 8) == m_currentChoices[2]) {
+                kCurrent = ibp / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 8, transformer->StringFromDouble(std::abs(data.faultCurrent[0][2]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 9, transformer->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[0][2]))));
+            m_gridFaultBranches->SetCellValue(rowNumber, 10, isOnline);
+            rowNumber++;
+
+            m_gridFaultBranches->SetCellValue(rowNumber, 0, _("Transformer"));
+            m_gridFaultBranches->SetCellValue(rowNumber, 1, data.name);
+            m_gridFaultBranches->SetCellValue(rowNumber, 2, busName2);
+            m_gridFaultBranches->SetCellValue(rowNumber, 3, busName1);
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 4) == m_currentChoices[1]) {
+                kCurrent = ibs;
+            } else if(m_gridFaultBranches->GetCellValue(1, 4) == m_currentChoices[2]) {
+                kCurrent = ibs / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 4, transformer->StringFromDouble(std::abs(data.faultCurrent[1][0]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 5, transformer->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[1][0]))));
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 6) == m_currentChoices[1]) {
+                kCurrent = ibs;
+            } else if(m_gridFaultBranches->GetCellValue(1, 6) == m_currentChoices[2]) {
+                kCurrent = ibs / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 6, transformer->StringFromDouble(std::abs(data.faultCurrent[1][1]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 7, transformer->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[1][1]))));
+            kCurrent = 1.0;
+            if(m_gridFaultBranches->GetCellValue(1, 8) == m_currentChoices[1]) {
+                kCurrent = ibs;
+            } else if(m_gridFaultBranches->GetCellValue(1, 8) == m_currentChoices[2]) {
+                kCurrent = ibs / 1e3;
+            }
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 8, transformer->StringFromDouble(std::abs(data.faultCurrent[1][2]) * kCurrent));
+            m_gridFaultBranches->SetCellValue(
+                rowNumber, 9, transformer->StringFromDouble(wxRadToDeg(std::arg(data.faultCurrent[1][2]))));
+            m_gridFaultBranches->SetCellValue(rowNumber, 10, isOnline);
+            rowNumber++;
+        }
+
+        m_gridFaultBranches->AutoSize();
     }
-    m_gridPFBranches->SetDefaultCellAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
-    // Values
-    m_gridPFBranches->AppendRows(lineList.size() + transformerList.size());
-    m_gridPFBranches->AutoSize();
+    m_changingValues = false;
 }
 
 void DataReport::OnPFBusGridChanged(wxGridEvent& event)
diff --git a/Project/DataReport.h b/Project/DataReport.h
index 0a23e91..61a7ccf 100644
--- a/Project/DataReport.h
+++ b/Project/DataReport.h
@@ -45,5 +45,6 @@ public:
     wxArrayString m_resistanceChoices;
     wxArrayString m_indReactanceChoices;
     wxArrayString m_capSusceptanceChoices;
+    wxArrayString m_currentChoices;
 };
 #endif  // DATAREPORT_H
diff --git a/Project/DataReport.wxcp b/Project/DataReport.wxcp
index e43aa2a..7e875e8 100644
--- a/Project/DataReport.wxcp
+++ b/Project/DataReport.wxcp
@@ -206,7 +206,7 @@
           }, {
            "type": "string",
            "m_label": "Name:",
-           "m_value": "m_notebookPowerFlowData"
+           "m_value": "m_notebookDataReport"
           }, {
            "type": "multi-string",
            "m_label": "Tooltip:",
diff --git a/Project/DataReportBase.cpp b/Project/DataReportBase.cpp
index 92d511f..0e14d38 100644
--- a/Project/DataReportBase.cpp
+++ b/Project/DataReportBase.cpp
@@ -64,13 +64,13 @@ DataReportBase::DataReportBase(wxWindow* parent, wxWindowID id, const wxString&
     
     boxSizerLvl1_1->Add(boxSizerLvl2_1, 1, wxEXPAND, WXC_FROM_DIP(5));
     
-    m_notebookPowerFlowData = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxBK_DEFAULT);
-    m_notebookPowerFlowData->SetName(wxT("m_notebookPowerFlowData"));
+    m_notebookDataReport = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxBK_DEFAULT);
+    m_notebookDataReport->SetName(wxT("m_notebookDataReport"));
     
-    boxSizerLvl2_1->Add(m_notebookPowerFlowData, 1, wxEXPAND, WXC_FROM_DIP(5));
+    boxSizerLvl2_1->Add(m_notebookDataReport, 1, wxEXPAND, WXC_FROM_DIP(5));
     
-    m_panelPowerFlowData = new wxPanel(m_notebookPowerFlowData, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebookPowerFlowData, wxSize(-1,-1)), wxTAB_TRAVERSAL);
-    m_notebookPowerFlowData->AddPage(m_panelPowerFlowData, _("Power flow data"), false);
+    m_panelPowerFlowData = new wxPanel(m_notebookDataReport, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebookDataReport, wxSize(-1,-1)), wxTAB_TRAVERSAL);
+    m_notebookDataReport->AddPage(m_panelPowerFlowData, _("Power flow data"), false);
     
     wxBoxSizer* boxSizerLvl3_1 = new wxBoxSizer(wxVERTICAL);
     m_panelPowerFlowData->SetSizer(boxSizerLvl3_1);
@@ -131,8 +131,8 @@ DataReportBase::DataReportBase(wxWindow* parent, wxWindowID id, const wxString&
     
     boxSizerLvl4_3->Add(m_gridPFBranches, 1, wxEXPAND, WXC_FROM_DIP(5));
     
-    m_panelFaultData = new wxPanel(m_notebookPowerFlowData, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebookPowerFlowData, wxSize(-1,-1)), wxTAB_TRAVERSAL);
-    m_notebookPowerFlowData->AddPage(m_panelFaultData, _("Fault data"), false);
+    m_panelFaultData = new wxPanel(m_notebookDataReport, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebookDataReport, wxSize(-1,-1)), wxTAB_TRAVERSAL);
+    m_notebookDataReport->AddPage(m_panelFaultData, _("Fault data"), false);
     
     wxBoxSizer* boxSizerLvl3_2 = new wxBoxSizer(wxVERTICAL);
     m_panelFaultData->SetSizer(boxSizerLvl3_2);
@@ -212,10 +212,10 @@ DataReportBase::DataReportBase(wxWindow* parent, wxWindowID id, const wxString&
     
     
     #if wxVERSION_NUMBER >= 2900
-    if(!wxPersistenceManager::Get().Find(m_notebookPowerFlowData)){
-        wxPersistenceManager::Get().RegisterAndRestore(m_notebookPowerFlowData);
+    if(!wxPersistenceManager::Get().Find(m_notebookDataReport)){
+        wxPersistenceManager::Get().RegisterAndRestore(m_notebookDataReport);
     } else {
-        wxPersistenceManager::Get().Restore(m_notebookPowerFlowData);
+        wxPersistenceManager::Get().Restore(m_notebookDataReport);
     }
     #endif
     
diff --git a/Project/DataReportBase.h b/Project/DataReportBase.h
index aa3f721..3e6784c 100644
--- a/Project/DataReportBase.h
+++ b/Project/DataReportBase.h
@@ -38,7 +38,7 @@
 class DataReportBase : public wxFrame
 {
 protected:
-    wxNotebook* m_notebookPowerFlowData;
+    wxNotebook* m_notebookDataReport;
     wxPanel* m_panelPowerFlowData;
     wxNotebook* m_notebookPowerFlow;
     wxPanel* m_panelPowerFlow;
@@ -86,7 +86,7 @@ public:
     wxPanel* GetPanelFaultGenerators() { return m_panelFaultGenerators; }
     wxNotebook* GetNotebookFault() { return m_notebookFault; }
     wxPanel* GetPanelFaultData() { return m_panelFaultData; }
-    wxNotebook* GetNotebookPowerFlowData() { return m_notebookPowerFlowData; }
+    wxNotebook* GetNotebookDataReport() { return m_notebookDataReport; }
     DataReportBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Data report"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_FRAME_STYLE);
     virtual ~DataReportBase();
 };
diff --git a/Project/ElectricCalculation.cpp b/Project/ElectricCalculation.cpp
index 95810fc..485325f 100644
--- a/Project/ElectricCalculation.cpp
+++ b/Project/ElectricCalculation.cpp
@@ -122,7 +122,7 @@ bool ElectricCalculation::GetYBus(std::vector<std::vector<std::complex<double> >
     for(auto it = m_lineList.begin(), itEnd = m_lineList.end(); it != itEnd; ++it) {
         Line* line = *it;
         if(line->IsOnline()) {
-            LineElectricalData data = line->GetElectricalData();
+            LineElectricalData data = line->GetPUElectricalData(systemPowerBase);
 
             int n1 = static_cast<Bus*>(line->GetParentList()[0])->GetElectricalData().number;
             int n2 = static_cast<Bus*>(line->GetParentList()[1])->GetElectricalData().number;
@@ -158,7 +158,7 @@ bool ElectricCalculation::GetYBus(std::vector<std::vector<std::complex<double> >
         Transformer* transformer = *it;
 
         if(transformer->IsOnline()) {
-            TransformerElectricalData data = transformer->GetElectricalData();
+            TransformerElectricalData data = transformer->GetPUElectricalData(systemPowerBase);
 
             int n1 = static_cast<Bus*>(transformer->GetParentList()[0])->GetElectricalData().number;
             int n2 = static_cast<Bus*>(transformer->GetParentList()[1])->GetElectricalData().number;
@@ -249,7 +249,10 @@ bool ElectricCalculation::GetYBus(std::vector<std::vector<std::complex<double> >
                         yBus[n][n] += 1.0 / std::complex<double>(data.negativeResistance, data.negativeReactance);
                     } break;
                     case ZERO_SEQ: {
-                        yBus[n][n] += 1.0 / std::complex<double>(data.zeroResistance, data.zeroReactance);
+                        if(data.groundNeutral) {
+                            yBus[n][n] += 1.0 / std::complex<double>(data.zeroResistance + 3.0 * data.groundResistance,
+                                                                     data.zeroReactance + 3.0 * data.groundReactance);
+                        }
                     } break;
                 }
             }
@@ -268,7 +271,10 @@ bool ElectricCalculation::GetYBus(std::vector<std::vector<std::complex<double> >
                         yBus[n][n] += 1.0 / std::complex<double>(data.negativeResistance, data.negativeReactance);
                     } break;
                     case ZERO_SEQ: {
-                        yBus[n][n] += 1.0 / std::complex<double>(data.zeroResistance, data.zeroReactance);
+                        if(data.groundNeutral) {
+                            yBus[n][n] += 1.0 / std::complex<double>(data.zeroResistance + 3.0 * data.groundResistance,
+                                                                     data.zeroReactance + 3.0 * data.groundReactance);
+                        }
                     } break;
                 }
             }
@@ -286,8 +292,10 @@ void ElectricCalculation::UpdateElementsPowerFlow(std::vector<std::complex<doubl
 {
     double zeroLimit = 1e-4;
     for(unsigned int i = 0; i < reactiveLimit.size(); ++i) {
-        if(reactiveLimit[i].maxLimit > -zeroLimit && reactiveLimit[i].maxLimit < zeroLimit) reactiveLimit[i].maxLimit = zeroLimit;
-        if(reactiveLimit[i].minLimit > -zeroLimit && reactiveLimit[i].minLimit < zeroLimit) reactiveLimit[i].minLimit = zeroLimit;
+        if(reactiveLimit[i].maxLimit > -zeroLimit && reactiveLimit[i].maxLimit < zeroLimit)
+            reactiveLimit[i].maxLimit = zeroLimit;
+        if(reactiveLimit[i].minLimit > -zeroLimit && reactiveLimit[i].minLimit < zeroLimit)
+            reactiveLimit[i].minLimit = zeroLimit;
     }
     for(unsigned int i = 0; i < power.size(); ++i) {
         if(std::real(power[i]) > -zeroLimit && std::real(power[i]) < zeroLimit)
diff --git a/Project/Fault.cpp b/Project/Fault.cpp
index fc4769b..d39e649 100644
--- a/Project/Fault.cpp
+++ b/Project/Fault.cpp
@@ -3,15 +3,9 @@
 #include "DegreesAndRadians.h"
 #endif
 
-Fault::Fault()
-    : ElectricCalculation()
-{
-}
-
+Fault::Fault() : ElectricCalculation() {}
 Fault::Fault(std::vector<Element*> elementList) { GetElementsFromList(elementList); }
-
 Fault::~Fault() {}
-
 bool Fault::RunFaultCalculation(double systemPowerBase)
 {
     int numberOfBuses = static_cast<int>(m_busList.size());
@@ -44,6 +38,7 @@ bool Fault::RunFaultCalculation(double systemPowerBase)
 
     // Pre-fault voltages (power flow solution).
     std::vector<std::complex<double> > preFaultVoltages;
+    preFaultVoltages.resize(m_busList.size());
 
     // Get fault parameters.
     int fNumber = -1;
@@ -53,7 +48,7 @@ bool Fault::RunFaultCalculation(double systemPowerBase)
     for(auto it = m_busList.begin(), itEnd = m_busList.end(); it != itEnd; ++it) {
         Bus* bus = *it;
         BusElectricalData data = bus->GetElectricalData();
-        preFaultVoltages.push_back(data.voltage);
+        preFaultVoltages[data.number] = data.voltage;
         if(data.hasFault) {
             fNumber = data.number;
             fType = data.faultType;
@@ -125,7 +120,7 @@ bool Fault::RunFaultCalculation(double systemPowerBase)
         case FAULT_LINE_GROUND: {
             fCurrentPos =
                 preFaultVoltage / (m_zBusPos[fNumber][fNumber] + m_zBusNeg[fNumber][fNumber] +
-                                      m_zBusZero[fNumber][fNumber] + std::complex<double>(3.0, 0.0) * fImpedance);
+                                   m_zBusZero[fNumber][fNumber] + std::complex<double>(3.0, 0.0) * fImpedance);
             switch(fLocation) {
                 case FAULT_LINE_A: {
                     fCurrentNeg = fCurrentPos;
@@ -148,9 +143,9 @@ bool Fault::RunFaultCalculation(double systemPowerBase)
     }
 
     // Convert sequence currents to ABC. [Iabc] = [A]*[I012]
-    m_fCurrentA = fCurrentPos + fCurrentNeg + fCurrentZero;
-    m_fCurrentB = fCurrentPos + a2 * fCurrentNeg + a * fCurrentZero;
-    m_fCurrentC = fCurrentPos + a * fCurrentNeg + a2 * fCurrentZero;
+    m_fCurrentA = fCurrentZero + fCurrentPos + fCurrentNeg;
+    m_fCurrentB = fCurrentZero + a2 * fCurrentPos + a * fCurrentNeg;
+    m_fCurrentC = fCurrentZero + a * fCurrentPos + a2 * fCurrentNeg;
 
     // Pos-fault voltages calculation
     m_posFaultVoltagePos.clear();
@@ -166,11 +161,11 @@ bool Fault::RunFaultCalculation(double systemPowerBase)
         m_posFaultVoltageZero.push_back(-m_zBusZero[i][fNumber] * fCurrentZero);
 
         // V012 -> Vabc
-        m_posFaultVoltageA.push_back(m_posFaultVoltagePos[i] + m_posFaultVoltageNeg[i] + m_posFaultVoltageZero[i]);
-        m_posFaultVoltageB.push_back(
-            m_posFaultVoltagePos[i] + a2 * m_posFaultVoltageNeg[i] + a * m_posFaultVoltageZero[i]);
-        m_posFaultVoltageC.push_back(
-            m_posFaultVoltagePos[i] + a * m_posFaultVoltageNeg[i] + a2 * m_posFaultVoltageZero[i]);
+        m_posFaultVoltageA.push_back(m_posFaultVoltageZero[i] + m_posFaultVoltagePos[i] + m_posFaultVoltageNeg[i]);
+        m_posFaultVoltageB.push_back(m_posFaultVoltageZero[i] + a2 * m_posFaultVoltagePos[i] +
+                                     a * m_posFaultVoltageNeg[i]);
+        m_posFaultVoltageC.push_back(m_posFaultVoltageZero[i] + a * m_posFaultVoltagePos[i] +
+                                     a2 * m_posFaultVoltageNeg[i]);
     }
 
     UpdateElementsFault(systemPowerBase);
@@ -204,9 +199,9 @@ void Fault::UpdateElementsFault(double systemPowerBase)
             int n1 = static_cast<Bus*>(line->GetParentList()[0])->GetElectricalData().number;
             int n2 = static_cast<Bus*>(line->GetParentList()[1])->GetElectricalData().number;
             auto data = line->GetElectricalData();
-            std::complex<double> vPos[2] = { m_posFaultVoltagePos[n1], m_posFaultVoltagePos[n2] };
-            std::complex<double> vNeg[2] = { m_posFaultVoltageNeg[n1], m_posFaultVoltageNeg[n2] };
-            std::complex<double> vZero[2] = { m_posFaultVoltageZero[n1], m_posFaultVoltageZero[n2] };
+            std::complex<double> vPos[2] = {m_posFaultVoltagePos[n1], m_posFaultVoltagePos[n2]};
+            std::complex<double> vNeg[2] = {m_posFaultVoltageNeg[n1], m_posFaultVoltageNeg[n2]};
+            std::complex<double> vZero[2] = {m_posFaultVoltageZero[n1], m_posFaultVoltageZero[n2]};
             std::complex<double> zPos(data.resistance, data.indReactance);
             std::complex<double> bPos(0.0, data.capSusceptance / 2.0);
             std::complex<double> zZero(data.zeroResistance, data.zeroIndReactance);
@@ -223,12 +218,12 @@ void Fault::UpdateElementsFault(double systemPowerBase)
             lineCurrentNeg[1] = ((vNeg[1] - vNeg[0]) / zPos) + (vNeg[1] * bPos);
             lineCurrentZero[1] = ((vZero[1] - vZero[0]) / zZero) + (vZero[1] * bZero);
 
-            data.faultCurrent[0][0] = lineCurrentPos[0] + lineCurrentNeg[0] + lineCurrentZero[0];
-            data.faultCurrent[1][0] = lineCurrentPos[0] + a2 * lineCurrentNeg[0] + a * lineCurrentZero[0];
-            data.faultCurrent[2][0] = lineCurrentPos[0] + a * lineCurrentNeg[0] + a2 * lineCurrentZero[0];
-            data.faultCurrent[0][1] = lineCurrentPos[1] + lineCurrentNeg[1] + lineCurrentZero[1];
-            data.faultCurrent[1][1] = lineCurrentPos[1] + a2 * lineCurrentNeg[1] + a * lineCurrentZero[1];
-            data.faultCurrent[2][1] = lineCurrentPos[1] + a * lineCurrentNeg[1] + a2 * lineCurrentZero[1];
+            data.faultCurrent[0][0] = lineCurrentZero[0] + lineCurrentPos[0] + lineCurrentNeg[0];
+            data.faultCurrent[0][1] = lineCurrentZero[0] + a2 * lineCurrentPos[0] + a * lineCurrentNeg[0];
+            data.faultCurrent[0][2] = lineCurrentZero[0] + a * lineCurrentPos[0] + a2 * lineCurrentNeg[0];
+            data.faultCurrent[1][0] = lineCurrentZero[1] + lineCurrentPos[1] + lineCurrentNeg[1];
+            data.faultCurrent[1][1] = lineCurrentZero[1] + a2 * lineCurrentPos[1] + a * lineCurrentNeg[1];
+            data.faultCurrent[1][2] = lineCurrentZero[1] + a * lineCurrentPos[1] + a2 * lineCurrentNeg[1];
 
             line->SetElectricalData(data);
         }
@@ -241,9 +236,9 @@ void Fault::UpdateElementsFault(double systemPowerBase)
             int n2 = static_cast<Bus*>(transformer->GetParentList()[1])->GetElectricalData().number;
             auto data = transformer->GetElectricalData();
 
-            std::complex<double> vPos[2] = { m_posFaultVoltagePos[n1], m_posFaultVoltagePos[n2] };
-            std::complex<double> vNeg[2] = { m_posFaultVoltageNeg[n1], m_posFaultVoltageNeg[n2] };
-            std::complex<double> vZero[2] = { m_posFaultVoltageZero[n1], m_posFaultVoltageZero[n2] };
+            std::complex<double> vPos[2] = {m_posFaultVoltagePos[n1], m_posFaultVoltagePos[n2]};
+            std::complex<double> vNeg[2] = {m_posFaultVoltageNeg[n1], m_posFaultVoltageNeg[n2]};
+            std::complex<double> vZero[2] = {m_posFaultVoltageZero[n1], m_posFaultVoltageZero[n2]};
             std::complex<double> zPos(data.resistance, data.indReactance);
             std::complex<double> zZero(data.zeroResistance, data.zeroIndReactance);
 
@@ -260,8 +255,8 @@ void Fault::UpdateElementsFault(double systemPowerBase)
                 transformerCurrentZero[1] = (vZero[1] - vZero[0]) / zZero;
             } else {
                 double radPhaseShift = wxDegToRad(data.phaseShift);
-                std::complex<double> t = std::complex<double>(
-                    data.turnsRatio * std::cos(radPhaseShift), -data.turnsRatio * std::sin(radPhaseShift));
+                std::complex<double> t = std::complex<double>(data.turnsRatio * std::cos(radPhaseShift),
+                                                              -data.turnsRatio * std::sin(radPhaseShift));
 
                 transformerCurrentPos[0] =
                     vPos[0] * (1.0 / (std::pow(std::abs(t), 2.0) * zPos)) - vPos[1] * (1.0 / (std::conj(t) * zPos));
@@ -295,16 +290,16 @@ void Fault::UpdateElementsFault(double systemPowerBase)
                 }
             }
 
-            data.faultCurrent[0][0] = transformerCurrentPos[0] + transformerCurrentNeg[0] + transformerCurrentZero[0];
-            data.faultCurrent[1][0] =
-                transformerCurrentPos[0] + a2 * transformerCurrentNeg[0] + a * transformerCurrentZero[0];
-            data.faultCurrent[2][0] =
-                transformerCurrentPos[0] + a * transformerCurrentNeg[0] + a2 * transformerCurrentZero[0];
-            data.faultCurrent[0][1] = transformerCurrentPos[1] + transformerCurrentNeg[1] + transformerCurrentZero[1];
+            data.faultCurrent[0][0] = transformerCurrentZero[0] + transformerCurrentPos[0] + transformerCurrentNeg[0];
+            data.faultCurrent[0][1] =
+                transformerCurrentZero[0] + a2 * transformerCurrentPos[0] + a * transformerCurrentNeg[0];
+            data.faultCurrent[0][2] =
+                transformerCurrentZero[0] + a * transformerCurrentPos[0] + a2 * transformerCurrentNeg[0];
+            data.faultCurrent[1][0] = transformerCurrentZero[1] + transformerCurrentPos[1] + transformerCurrentNeg[1];
             data.faultCurrent[1][1] =
-                transformerCurrentPos[1] + a2 * transformerCurrentNeg[1] + a * transformerCurrentZero[1];
-            data.faultCurrent[2][1] =
-                transformerCurrentPos[1] + a * transformerCurrentNeg[1] + a2 * transformerCurrentZero[1];
+                transformerCurrentZero[1] + a2 * transformerCurrentPos[1] + a * transformerCurrentNeg[1];
+            data.faultCurrent[1][2] =
+                transformerCurrentZero[1] + a * transformerCurrentPos[1] + a2 * transformerCurrentNeg[1];
 
             transformer->SetElectricaData(data);
         }
@@ -315,7 +310,7 @@ void Fault::UpdateElementsFault(double systemPowerBase)
         if(syncGenerator->IsOnline()) {
             Bus* bus = static_cast<Bus*>(syncGenerator->GetParentList()[0]);
             int n = bus->GetElectricalData().number;
-            std::complex<double> v = bus->GetElectricalData().voltage; // Pre-fault voltage.
+            std::complex<double> v = bus->GetElectricalData().voltage;  // Pre-fault voltage.
             auto data = syncGenerator->GetElectricalData();
 
             std::complex<double> vPos = m_posFaultVoltagePos[n];
@@ -324,8 +319,8 @@ void Fault::UpdateElementsFault(double systemPowerBase)
 
             std::complex<double> zPos(data.positiveResistance, data.positiveReactance);
             std::complex<double> zNeg(data.negativeResistance, data.negativeReactance);
-            std::complex<double> zZero(
-                data.zeroResistance + 3.0 * data.groundResistance, data.negativeReactance + 3.0 * data.groundReactance);
+            std::complex<double> zZero(data.zeroResistance + 3.0 * data.groundResistance,
+                                       data.negativeReactance + 3.0 * data.groundReactance);
 
             std::complex<double> syncGeneratorCurrentPos = (v - vPos) / zPos;
             std::complex<double> syncGeneratorCurrentNeg = (-vNeg) / zNeg;
@@ -347,7 +342,7 @@ void Fault::UpdateElementsFault(double systemPowerBase)
         if(syncMotor->IsOnline()) {
             Bus* bus = static_cast<Bus*>(syncMotor->GetParentList()[0]);
             int n = bus->GetElectricalData().number;
-            std::complex<double> v = bus->GetElectricalData().voltage; // Pre-fault voltage.
+            std::complex<double> v = bus->GetElectricalData().voltage;  // Pre-fault voltage.
             auto data = syncMotor->GetElectricalData();
 
             std::complex<double> vPos = m_posFaultVoltagePos[n];
@@ -356,19 +351,19 @@ void Fault::UpdateElementsFault(double systemPowerBase)
 
             std::complex<double> zPos(data.positiveResistance, data.positiveReactance);
             std::complex<double> zNeg(data.negativeResistance, data.negativeReactance);
-            std::complex<double> zZero(
-                data.zeroResistance + 3.0 * data.groundResistance, data.negativeReactance + 3.0 * data.groundReactance);
+            std::complex<double> zZero(data.zeroResistance + 3.0 * data.groundResistance,
+                                       data.negativeReactance + 3.0 * data.groundReactance);
 
             std::complex<double> syncGeneratorCurrentPos = (v - vPos) / zPos;
             std::complex<double> syncGeneratorCurrentNeg = (-vNeg) / zNeg;
             std::complex<double> syncGeneratorCurrentZero(0.0, 0.0);
             if(data.groundNeutral) syncGeneratorCurrentZero = (-vZero) / zZero;
 
-            data.faultCurrent[0] = syncGeneratorCurrentPos + syncGeneratorCurrentNeg + syncGeneratorCurrentZero;
+            data.faultCurrent[0] = syncGeneratorCurrentZero + syncGeneratorCurrentPos + syncGeneratorCurrentNeg;
             data.faultCurrent[1] =
-                syncGeneratorCurrentPos + a2 * syncGeneratorCurrentNeg + a * syncGeneratorCurrentZero;
+                syncGeneratorCurrentZero + a2 * syncGeneratorCurrentPos + a * syncGeneratorCurrentNeg;
             data.faultCurrent[2] =
-                syncGeneratorCurrentPos + a * syncGeneratorCurrentNeg + a2 * syncGeneratorCurrentZero;
+                syncGeneratorCurrentZero + a * syncGeneratorCurrentPos + a2 * syncGeneratorCurrentNeg;
 
             syncMotor->SetElectricalData(data);
         }
@@ -386,7 +381,7 @@ bool Fault::RunSCPowerCalcutation(double systemPowerBase)
         m_errorMsg = _("Fail to invert the positive sequence admittance matrix.");
         return false;
     }
-    
+
     // Set the SC power.
     for(auto it = m_busList.begin(), itEnd = m_busList.end(); it != itEnd; ++it) {
         Bus* bus = *it;
@@ -395,6 +390,6 @@ bool Fault::RunSCPowerCalcutation(double systemPowerBase)
         data.scPower = 1.0 / std::abs(m_zBusPos[n][n]);
         bus->SetElectricalData(data);
     }
-    
+
     return true;
 }
diff --git a/Project/Line.cpp b/Project/Line.cpp
index 637e45b..1277361 100644
--- a/Project/Line.cpp
+++ b/Project/Line.cpp
@@ -506,79 +506,67 @@ wxString Line::GetTipText() const
     return tipText;
 }
 
-LineElectricalData Line::GetPUElectricalData(double basePower) const
+LineElectricalData Line::GetPUElectricalData(double systemBasePower)
 {
     LineElectricalData data = m_electricalData;
-    double lineBasePower = basePower;
-    if(m_electricalData.useLinePower) {
-        lineBasePower = m_electricalData.nominalPower;
-        switch(m_electricalData.nominalPowerUnit) {
-            case UNIT_MVA: {
-                lineBasePower *= 1e6;
-            } break;
-            case UNIT_kVA: {
-                lineBasePower *= 1e3;
-            } break;
-            default:
-                break;
-        }
-    }
-    double vb = m_electricalData.nominalVoltage;
-    if(m_electricalData.nominalVoltageUnit == UNIT_kV) vb *= 1e3;
-    double zb = (vb * vb) / basePower;
+    double lineBasePower = GetValueFromUnit(data.nominalPower, data.nominalPowerUnit);
+    double baseVoltage = GetValueFromUnit(data.nominalVoltage, data.nominalVoltageUnit);
+    double systemBaseImpedance = (baseVoltage * baseVoltage) / systemBasePower;
+    double lineBaseImpedance = (baseVoltage * baseVoltage) / lineBasePower;
 
     // Resistance
     double r = data.resistance;
-    switch(data.resistanceUnit) {
-        case UNIT_PU: {
-            if(m_electricalData.useLinePower) data.resistance = (basePower / lineBasePower) * r;
-        } break;
-        case UNIT_OHM: {
-            data.resistance = r / zb;
-            data.resistanceUnit = UNIT_PU;
-        } break;
-        case UNIT_OHM_km: {
-            data.resistance = (r * data.lineSize) / zb;
-            data.resistanceUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    if(data.resistanceUnit == UNIT_OHM_km) r *= data.lineSize;
+    if(data.resistanceUnit == UNIT_PU) {
+        if(data.useLinePower) data.resistance = (r * lineBaseImpedance) / systemBaseImpedance;
+    } else {
+        data.resistance = r / systemBaseImpedance;
     }
+    data.resistanceUnit = UNIT_PU;
 
-    // Indutive reactance
-    double xl = data.indReactance;
-    switch(data.indReactanceUnit) {
-        case UNIT_PU: {
-            if(m_electricalData.useLinePower) data.indReactance = (basePower / lineBasePower) * xl;
-        } break;
-        case UNIT_OHM: {
-            data.indReactance = xl / zb;
-            data.indReactanceUnit = UNIT_PU;
-        } break;
-        case UNIT_OHM_km: {
-            data.indReactance = (xl * data.lineSize) / zb;
-            data.indReactanceUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    // Inductive reactance
+    double x = data.indReactance;
+    if(data.indReactanceUnit == UNIT_OHM_km) x *= data.lineSize;
+    if(data.indReactanceUnit == UNIT_PU) {
+        if(data.useLinePower) data.indReactance = (x * lineBaseImpedance) / systemBaseImpedance;
+    } else {
+        data.indReactance = x / systemBaseImpedance;
     }
+    data.indReactanceUnit = UNIT_PU;
 
     // Capacitive susceptance
     double b = data.capSusceptance;
-    switch(data.capSusceptanceUnit) {
-        case UNIT_PU: {
-            if(m_electricalData.useLinePower) data.capSusceptance = (basePower / lineBasePower) * b;
-        } break;
-        case UNIT_S: {
-            data.capSusceptance = b / zb;
-            data.capSusceptanceUnit = UNIT_PU;
-        } break;
-        case UNIT_S_km: {
-            data.capSusceptance = (b * data.lineSize) / zb;
-            data.capSusceptanceUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    if(data.capSusceptanceUnit == UNIT_OHM_km) b *= data.lineSize;
+    if(data.capSusceptanceUnit == UNIT_PU) {
+        if(data.useLinePower) data.capSusceptance = (b * lineBaseImpedance) / systemBaseImpedance;
+    } else {
+        data.capSusceptance = b / systemBaseImpedance;
+    }
+    data.capSusceptanceUnit = UNIT_PU;
+
+    // Fault
+
+    // Zero seq. resistance
+    double r0 = data.zeroResistance;
+    if(data.useLinePower) data.zeroResistance = (r0 * lineBaseImpedance) / systemBaseImpedance;
+
+    // Zero seq. ind. reactance
+    double x0 = data.zeroIndReactance;
+    if(data.useLinePower) data.zeroIndReactance = (x0 * lineBaseImpedance) / systemBaseImpedance;
+
+    // Zero seq. cap. susceptance
+    double b0 = data.zeroCapSusceptance;
+    if(data.useLinePower) data.zeroCapSusceptance = (b0 * lineBaseImpedance) / systemBaseImpedance;
+    
+    if(!m_online) {
+        data.powerFlow[0] = std::complex<double>(0,0);
+        data.powerFlow[1] = std::complex<double>(0,0);
+        data.faultCurrent[0][0] = std::complex<double>(0,0);
+        data.faultCurrent[0][1] = std::complex<double>(0,0);
+        data.faultCurrent[0][2] = std::complex<double>(0,0);
+        data.faultCurrent[1][0] = std::complex<double>(0,0);
+        data.faultCurrent[1][1] = std::complex<double>(0,0);
+        data.faultCurrent[1][2] = std::complex<double>(0,0);
     }
 
     return data;
diff --git a/Project/Line.h b/Project/Line.h
index 9cea359..513dc11 100644
--- a/Project/Line.h
+++ b/Project/Line.h
@@ -21,8 +21,8 @@ struct LineElectricalData {
     bool useLinePower = false;
 
     // Power flow (p.u.)
-    std::complex<double> current[2] = { std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0) };
-    std::complex<double> powerFlow[2] = { std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0) };
+    std::complex<double> current[2] = {std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0)};
+    std::complex<double> powerFlow[2] = {std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0)};
 
     // Fault
     double zeroResistance = 0.0;
@@ -34,7 +34,7 @@ struct LineElectricalData {
 
 class Line : public Branch
 {
-public:
+   public:
     Line();
     Line(wxString name);
     ~Line();
@@ -60,14 +60,14 @@ public:
     virtual void SetPowerFlowDirection(PowerFlowDirection pfDirection);
     virtual bool ShowForm(wxWindow* parent, Element* element);
     virtual LineElectricalData GetElectricalData() const { return m_electricalData; }
-    virtual LineElectricalData GetPUElectricalData(double basePower) const;
+    virtual LineElectricalData GetPUElectricalData(double systemBasePower);
     virtual void SetElectricalData(LineElectricalData electricalData) { m_electricalData = electricalData; }
     virtual void SetNominalVoltage(std::vector<double> nominalVoltage, std::vector<ElectricalUnit> nominalVoltageUnit);
     virtual void SetPointList(std::vector<wxPoint2DDouble> pointList);
 
-protected:
+   protected:
     void UpdatePowerFlowArrowsPosition();
     LineElectricalData m_electricalData;
 };
 
-#endif // LINE_H
+#endif  // LINE_H
diff --git a/Project/Machines.cpp b/Project/Machines.cpp
index 883ad3a..c793469 100644
--- a/Project/Machines.cpp
+++ b/Project/Machines.cpp
@@ -1,5 +1,8 @@
 #include "Machines.h"
 
+#include "ControlElementContainer.h"
+#include "ControlElementSolver.h"
+
 Machines::Machines() : PowerElement() {}
 Machines::~Machines() {}
 bool Machines::AddParent(Element* parent, wxPoint2DDouble position)
diff --git a/Project/Machines.h b/Project/Machines.h
index 9c2e6cd..c1814d5 100644
--- a/Project/Machines.h
+++ b/Project/Machines.h
@@ -3,6 +3,9 @@
 
 #include "PowerElement.h"
 
+class ControlElementContainer;
+class ControlElementSolver;
+
 class Machines : public PowerElement
 {
    public:
diff --git a/Project/PowerElement.cpp b/Project/PowerElement.cpp
index 2a00abf..379d341 100644
--- a/Project/PowerElement.cpp
+++ b/Project/PowerElement.cpp
@@ -143,3 +143,24 @@ void PowerElement::DrawPowerFlowPts() const
         }
     }
 }
+
+double PowerElement::GetValueFromUnit(double value, ElectricalUnit valueUnit)
+{
+    switch(valueUnit) {
+        case UNIT_kV:
+        case UNIT_kA:
+        case UNIT_kW:
+        case UNIT_kVA:
+        case UNIT_kVAr: {
+            return value * 1e3;
+        } break;
+        case UNIT_MW:
+        case UNIT_MVA:
+        case UNIT_MVAr: {
+            return value * 1e6;
+        }
+        default:
+            break;
+    }
+    return value;
+}
diff --git a/Project/PowerElement.h b/Project/PowerElement.h
index e1afc7a..9bf125d 100644
--- a/Project/PowerElement.h
+++ b/Project/PowerElement.h
@@ -189,6 +189,8 @@ class PowerElement : public Element
      * @param dynEvent Event occurrence.
      */
     virtual void SetDynamicEvent(bool dynEvent = true) { m_dynEvent = dynEvent; }
+    virtual double GetValueFromUnit(double value, ElectricalUnit valueUnit);
+
    protected:
     SwitchingData m_swData;
     std::vector<std::vector<wxPoint2DDouble> > m_powerFlowArrow;
diff --git a/Project/Project.mk b/Project/Project.mk
index 762e17a..b38528a 100644
--- a/Project/Project.mk
+++ b/Project/Project.mk
@@ -5,16 +5,16 @@
 ## Release
 ProjectName            :=Project
 ConfigurationName      :=Release
-WorkspacePath          :=C:/Users/Thales/Documents/GitHub/PSP
-ProjectPath            :=C:/Users/Thales/Documents/GitHub/PSP/Project
+WorkspacePath          :=C:/Users/NDSE-69/Documents/GitHub/PSP
+ProjectPath            :=C:/Users/NDSE-69/Documents/GitHub/PSP/Project
 IntermediateDirectory  :=./Release
 OutDir                 := $(IntermediateDirectory)
 CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
-User                   :=Thales
-Date                   :=07/09/2017
-CodeLitePath           :="C:/Program Files (x86)/CodeLite"
+User                   :=NDSE-69
+Date                   :=08/09/2017
+CodeLitePath           :="C:/Program Files/CodeLite"
 LinkerName             :=C:/TDM-GCC-64/bin/g++.exe
 SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC
 ObjectSuffix           :=.o
@@ -61,8 +61,7 @@ AS       := C:/TDM-GCC-64/bin/as.exe
 ##
 ## User defined environment variables
 ##
-CodeLiteDir:=C:\Program Files (x86)\CodeLite
-UNIT_TEST_PP_SRC_DIR:=C:\UnitTest++-1.3
+CodeLiteDir:=C:\Program Files\CodeLite
 WXWIN:=C:\wxWidgets-3.1.0
 WXCFG:=gcc_dll\mswu
 Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxGLString.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) \
@@ -108,7 +107,7 @@ PreBuild:
 ## Objects
 ##
 $(IntermediateDirectory)/main.cpp$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/main.cpp$(DependSuffix): main.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/main.cpp$(DependSuffix) -MM main.cpp
 
@@ -116,9 +115,9 @@ $(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.cpp$(PreprocessSuffix) main.cpp
 
 $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix): win_resources.rc
-	$(RcCompilerName) -i "C:/Users/Thales/Documents/GitHub/PSP/Project/win_resources.rc" $(RcCmpOptions)   $(ObjectSwitch)$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(RcIncludePath)
+	$(RcCompilerName) -i "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/win_resources.rc" $(RcCmpOptions)   $(ObjectSwitch)$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(RcIncludePath)
 $(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix): PropertiesData.cpp $(IntermediateDirectory)/PropertiesData.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/PropertiesData.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PropertiesData.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/PropertiesData.cpp$(DependSuffix): PropertiesData.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PropertiesData.cpp$(DependSuffix) -MM PropertiesData.cpp
 
@@ -126,7 +125,7 @@ $(IntermediateDirectory)/PropertiesData.cpp$(PreprocessSuffix): PropertiesData.c
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PropertiesData.cpp$(PreprocessSuffix) PropertiesData.cpp
 
 $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix): ArtMetro.cpp $(IntermediateDirectory)/ArtMetro.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ArtMetro.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ArtMetro.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ArtMetro.cpp$(DependSuffix): ArtMetro.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ArtMetro.cpp$(DependSuffix) -MM ArtMetro.cpp
 
@@ -134,7 +133,7 @@ $(IntermediateDirectory)/ArtMetro.cpp$(PreprocessSuffix): ArtMetro.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ArtMetro.cpp$(PreprocessSuffix) ArtMetro.cpp
 
 $(IntermediateDirectory)/wxGLString.cpp$(ObjectSuffix): wxGLString.cpp $(IntermediateDirectory)/wxGLString.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/wxGLString.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/wxGLString.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/wxGLString.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/wxGLString.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/wxGLString.cpp$(DependSuffix): wxGLString.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/wxGLString.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/wxGLString.cpp$(DependSuffix) -MM wxGLString.cpp
 
@@ -142,7 +141,7 @@ $(IntermediateDirectory)/wxGLString.cpp$(PreprocessSuffix): wxGLString.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/wxGLString.cpp$(PreprocessSuffix) wxGLString.cpp
 
 $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix): MainFrameBitmaps.cpp $(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/MainFrameBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrameBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix): MainFrameBitmaps.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix) -MM MainFrameBitmaps.cpp
 
@@ -150,7 +149,7 @@ $(IntermediateDirectory)/MainFrameBitmaps.cpp$(PreprocessSuffix): MainFrameBitma
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(PreprocessSuffix) MainFrameBitmaps.cpp
 
 $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix): WorkspaceBitmaps.cpp $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/WorkspaceBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/WorkspaceBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(DependSuffix): WorkspaceBitmaps.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(DependSuffix) -MM WorkspaceBitmaps.cpp
 
@@ -158,7 +157,7 @@ $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(PreprocessSuffix): WorkspaceBitma
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(PreprocessSuffix) WorkspaceBitmaps.cpp
 
 $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix): BusFormBitmaps.cpp $(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/BusFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/BusFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix): BusFormBitmaps.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix) -MM BusFormBitmaps.cpp
 
@@ -166,7 +165,7 @@ $(IntermediateDirectory)/BusFormBitmaps.cpp$(PreprocessSuffix): BusFormBitmaps.c
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/BusFormBitmaps.cpp$(PreprocessSuffix) BusFormBitmaps.cpp
 
 $(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix): ElementFormBitmaps.cpp $(IntermediateDirectory)/ElementFormBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ElementFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ElementFormBitmaps.cpp$(DependSuffix): ElementFormBitmaps.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementFormBitmaps.cpp$(DependSuffix) -MM ElementFormBitmaps.cpp
 
@@ -174,7 +173,7 @@ $(IntermediateDirectory)/ElementFormBitmaps.cpp$(PreprocessSuffix): ElementFormB
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(PreprocessSuffix) ElementFormBitmaps.cpp
 
 $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix): ControlEditorBitmaps.cpp $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ControlEditorBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlEditorBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix): ControlEditorBitmaps.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix) -MM ControlEditorBitmaps.cpp
 
@@ -182,7 +181,7 @@ $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(PreprocessSuffix): ControlEdi
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(PreprocessSuffix) ControlEditorBitmaps.cpp
 
 $(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix): ChartViewBitmaps.cpp $(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ChartViewBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartViewBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix): ChartViewBitmaps.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix) -MM ChartViewBitmaps.cpp
 
@@ -190,7 +189,7 @@ $(IntermediateDirectory)/ChartViewBitmaps.cpp$(PreprocessSuffix): ChartViewBitma
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartViewBitmaps.cpp$(PreprocessSuffix) ChartViewBitmaps.cpp
 
 $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix): PropertiesFormBitmaps.cpp $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/PropertiesFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PropertiesFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(DependSuffix): PropertiesFormBitmaps.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(DependSuffix) -MM PropertiesFormBitmaps.cpp
 
@@ -198,7 +197,7 @@ $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(PreprocessSuffix): Propertie
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(PreprocessSuffix) PropertiesFormBitmaps.cpp
 
 $(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix): DataReportBitmaps.cpp $(IntermediateDirectory)/DataReportBitmaps.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/DataReportBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/DataReportBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/DataReportBitmaps.cpp$(DependSuffix): DataReportBitmaps.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/DataReportBitmaps.cpp$(DependSuffix) -MM DataReportBitmaps.cpp
 
@@ -206,7 +205,7 @@ $(IntermediateDirectory)/DataReportBitmaps.cpp$(PreprocessSuffix): DataReportBit
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/DataReportBitmaps.cpp$(PreprocessSuffix) DataReportBitmaps.cpp
 
 $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix): MainFrameBase.cpp $(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/MainFrameBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrameBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix): MainFrameBase.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix) -MM MainFrameBase.cpp
 
@@ -214,7 +213,7 @@ $(IntermediateDirectory)/MainFrameBase.cpp$(PreprocessSuffix): MainFrameBase.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MainFrameBase.cpp$(PreprocessSuffix) MainFrameBase.cpp
 
 $(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix): WorkspaceBase.cpp $(IntermediateDirectory)/WorkspaceBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/WorkspaceBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/WorkspaceBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/WorkspaceBase.cpp$(DependSuffix): WorkspaceBase.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/WorkspaceBase.cpp$(DependSuffix) -MM WorkspaceBase.cpp
 
@@ -222,7 +221,7 @@ $(IntermediateDirectory)/WorkspaceBase.cpp$(PreprocessSuffix): WorkspaceBase.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/WorkspaceBase.cpp$(PreprocessSuffix) WorkspaceBase.cpp
 
 $(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix): ElementForm.cpp $(IntermediateDirectory)/ElementForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ElementForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ElementForm.cpp$(DependSuffix): ElementForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementForm.cpp$(DependSuffix) -MM ElementForm.cpp
 
@@ -230,7 +229,7 @@ $(IntermediateDirectory)/ElementForm.cpp$(PreprocessSuffix): ElementForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementForm.cpp$(PreprocessSuffix) ElementForm.cpp
 
 $(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix): ControlEditorBase.cpp $(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ControlEditorBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlEditorBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix): ControlEditorBase.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix) -MM ControlEditorBase.cpp
 
@@ -238,7 +237,7 @@ $(IntermediateDirectory)/ControlEditorBase.cpp$(PreprocessSuffix): ControlEditor
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditorBase.cpp$(PreprocessSuffix) ControlEditorBase.cpp
 
 $(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix): ChartViewBase.cpp $(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ChartViewBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartViewBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix): ChartViewBase.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix) -MM ChartViewBase.cpp
 
@@ -246,7 +245,7 @@ $(IntermediateDirectory)/ChartViewBase.cpp$(PreprocessSuffix): ChartViewBase.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartViewBase.cpp$(PreprocessSuffix) ChartViewBase.cpp
 
 $(IntermediateDirectory)/PropertiesForm.cpp$(ObjectSuffix): PropertiesForm.cpp $(IntermediateDirectory)/PropertiesForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/PropertiesForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PropertiesForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/PropertiesForm.cpp$(DependSuffix): PropertiesForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PropertiesForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PropertiesForm.cpp$(DependSuffix) -MM PropertiesForm.cpp
 
@@ -254,7 +253,7 @@ $(IntermediateDirectory)/PropertiesForm.cpp$(PreprocessSuffix): PropertiesForm.c
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PropertiesForm.cpp$(PreprocessSuffix) PropertiesForm.cpp
 
 $(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix): DataReportBase.cpp $(IntermediateDirectory)/DataReportBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/DataReportBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/DataReportBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/DataReportBase.cpp$(DependSuffix): DataReportBase.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/DataReportBase.cpp$(DependSuffix) -MM DataReportBase.cpp
 
@@ -262,7 +261,7 @@ $(IntermediateDirectory)/DataReportBase.cpp$(PreprocessSuffix): DataReportBase.c
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/DataReportBase.cpp$(PreprocessSuffix) DataReportBase.cpp
 
 $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix): ElectricCalculation.cpp $(IntermediateDirectory)/ElectricCalculation.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ElectricCalculation.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElectricCalculation.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ElectricCalculation.cpp$(DependSuffix): ElectricCalculation.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElectricCalculation.cpp$(DependSuffix) -MM ElectricCalculation.cpp
 
@@ -270,7 +269,7 @@ $(IntermediateDirectory)/ElectricCalculation.cpp$(PreprocessSuffix): ElectricCal
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElectricCalculation.cpp$(PreprocessSuffix) ElectricCalculation.cpp
 
 $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix): PowerFlow.cpp $(IntermediateDirectory)/PowerFlow.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/PowerFlow.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PowerFlow.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/PowerFlow.cpp$(DependSuffix): PowerFlow.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PowerFlow.cpp$(DependSuffix) -MM PowerFlow.cpp
 
@@ -278,7 +277,7 @@ $(IntermediateDirectory)/PowerFlow.cpp$(PreprocessSuffix): PowerFlow.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PowerFlow.cpp$(PreprocessSuffix) PowerFlow.cpp
 
 $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix): Fault.cpp $(IntermediateDirectory)/Fault.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Fault.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Fault.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Fault.cpp$(DependSuffix): Fault.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Fault.cpp$(DependSuffix) -MM Fault.cpp
 
@@ -286,7 +285,7 @@ $(IntermediateDirectory)/Fault.cpp$(PreprocessSuffix): Fault.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Fault.cpp$(PreprocessSuffix) Fault.cpp
 
 $(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix): Electromechanical.cpp $(IntermediateDirectory)/Electromechanical.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Electromechanical.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Electromechanical.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Electromechanical.cpp$(DependSuffix): Electromechanical.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Electromechanical.cpp$(DependSuffix) -MM Electromechanical.cpp
 
@@ -294,7 +293,7 @@ $(IntermediateDirectory)/Electromechanical.cpp$(PreprocessSuffix): Electromechan
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Electromechanical.cpp$(PreprocessSuffix) Electromechanical.cpp
 
 $(IntermediateDirectory)/Element.cpp$(ObjectSuffix): Element.cpp $(IntermediateDirectory)/Element.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Element.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Element.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Element.cpp$(DependSuffix): Element.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Element.cpp$(DependSuffix) -MM Element.cpp
 
@@ -302,7 +301,7 @@ $(IntermediateDirectory)/Element.cpp$(PreprocessSuffix): Element.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Element.cpp$(PreprocessSuffix) Element.cpp
 
 $(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix): ElementDataObject.cpp $(IntermediateDirectory)/ElementDataObject.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ElementDataObject.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementDataObject.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ElementDataObject.cpp$(DependSuffix): ElementDataObject.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementDataObject.cpp$(DependSuffix) -MM ElementDataObject.cpp
 
@@ -310,7 +309,7 @@ $(IntermediateDirectory)/ElementDataObject.cpp$(PreprocessSuffix): ElementDataOb
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementDataObject.cpp$(PreprocessSuffix) ElementDataObject.cpp
 
 $(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix): ElementPlotData.cpp $(IntermediateDirectory)/ElementPlotData.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ElementPlotData.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementPlotData.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ElementPlotData.cpp$(DependSuffix): ElementPlotData.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementPlotData.cpp$(DependSuffix) -MM ElementPlotData.cpp
 
@@ -318,7 +317,7 @@ $(IntermediateDirectory)/ElementPlotData.cpp$(PreprocessSuffix): ElementPlotData
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementPlotData.cpp$(PreprocessSuffix) ElementPlotData.cpp
 
 $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix): wxMathPlot/mathplot.cpp $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/wxMathPlot/mathplot.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/wxMathPlot/mathplot.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(DependSuffix): wxMathPlot/mathplot.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(DependSuffix) -MM wxMathPlot/mathplot.cpp
 
@@ -326,7 +325,7 @@ $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(PreprocessSuffix): wxMathPlot/
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(PreprocessSuffix) wxMathPlot/mathplot.cpp
 
 $(IntermediateDirectory)/Camera.cpp$(ObjectSuffix): Camera.cpp $(IntermediateDirectory)/Camera.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Camera.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Camera.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Camera.cpp$(DependSuffix): Camera.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Camera.cpp$(DependSuffix) -MM Camera.cpp
 
@@ -334,7 +333,7 @@ $(IntermediateDirectory)/Camera.cpp$(PreprocessSuffix): Camera.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Camera.cpp$(PreprocessSuffix) Camera.cpp
 
 $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix): MainFrame.cpp $(IntermediateDirectory)/MainFrame.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/MainFrame.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrame.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/MainFrame.cpp$(DependSuffix): MainFrame.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MainFrame.cpp$(DependSuffix) -MM MainFrame.cpp
 
@@ -342,7 +341,7 @@ $(IntermediateDirectory)/MainFrame.cpp$(PreprocessSuffix): MainFrame.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MainFrame.cpp$(PreprocessSuffix) MainFrame.cpp
 
 $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix): Workspace.cpp $(IntermediateDirectory)/Workspace.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Workspace.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Workspace.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Workspace.cpp$(DependSuffix): Workspace.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Workspace.cpp$(DependSuffix) -MM Workspace.cpp
 
@@ -350,7 +349,7 @@ $(IntermediateDirectory)/Workspace.cpp$(PreprocessSuffix): Workspace.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Workspace.cpp$(PreprocessSuffix) Workspace.cpp
 
 $(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix): ChartView.cpp $(IntermediateDirectory)/ChartView.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ChartView.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartView.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ChartView.cpp$(DependSuffix): ChartView.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartView.cpp$(DependSuffix) -MM ChartView.cpp
 
@@ -358,7 +357,7 @@ $(IntermediateDirectory)/ChartView.cpp$(PreprocessSuffix): ChartView.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartView.cpp$(PreprocessSuffix) ChartView.cpp
 
 $(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix): ControlEditor.cpp $(IntermediateDirectory)/ControlEditor.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ControlEditor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlEditor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ControlEditor.cpp$(DependSuffix): ControlEditor.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlEditor.cpp$(DependSuffix) -MM ControlEditor.cpp
 
@@ -366,7 +365,7 @@ $(IntermediateDirectory)/ControlEditor.cpp$(PreprocessSuffix): ControlEditor.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditor.cpp$(PreprocessSuffix) ControlEditor.cpp
 
 $(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix): DataReport.cpp $(IntermediateDirectory)/DataReport.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/DataReport.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/DataReport.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/DataReport.cpp$(DependSuffix): DataReport.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/DataReport.cpp$(DependSuffix) -MM DataReport.cpp
 
@@ -374,7 +373,7 @@ $(IntermediateDirectory)/DataReport.cpp$(PreprocessSuffix): DataReport.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/DataReport.cpp$(PreprocessSuffix) DataReport.cpp
 
 $(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix): FileHanding.cpp $(IntermediateDirectory)/FileHanding.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/FileHanding.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/FileHanding.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/FileHanding.cpp$(DependSuffix): FileHanding.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/FileHanding.cpp$(DependSuffix) -MM FileHanding.cpp
 
@@ -382,7 +381,7 @@ $(IntermediateDirectory)/FileHanding.cpp$(PreprocessSuffix): FileHanding.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/FileHanding.cpp$(PreprocessSuffix) FileHanding.cpp
 
 $(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix): ConnectionLine.cpp $(IntermediateDirectory)/ConnectionLine.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ConnectionLine.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ConnectionLine.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ConnectionLine.cpp$(DependSuffix): ConnectionLine.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ConnectionLine.cpp$(DependSuffix) -MM ConnectionLine.cpp
 
@@ -390,7 +389,7 @@ $(IntermediateDirectory)/ConnectionLine.cpp$(PreprocessSuffix): ConnectionLine.c
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ConnectionLine.cpp$(PreprocessSuffix) ConnectionLine.cpp
 
 $(IntermediateDirectory)/Constant.cpp$(ObjectSuffix): Constant.cpp $(IntermediateDirectory)/Constant.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Constant.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Constant.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Constant.cpp$(DependSuffix): Constant.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Constant.cpp$(DependSuffix) -MM Constant.cpp
 
@@ -398,7 +397,7 @@ $(IntermediateDirectory)/Constant.cpp$(PreprocessSuffix): Constant.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Constant.cpp$(PreprocessSuffix) Constant.cpp
 
 $(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix): ControlElement.cpp $(IntermediateDirectory)/ControlElement.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ControlElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ControlElement.cpp$(DependSuffix): ControlElement.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlElement.cpp$(DependSuffix) -MM ControlElement.cpp
 
@@ -406,7 +405,7 @@ $(IntermediateDirectory)/ControlElement.cpp$(PreprocessSuffix): ControlElement.c
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlElement.cpp$(PreprocessSuffix) ControlElement.cpp
 
 $(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix): ControlElementContainer.cpp $(IntermediateDirectory)/ControlElementContainer.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ControlElementContainer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlElementContainer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ControlElementContainer.cpp$(DependSuffix): ControlElementContainer.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlElementContainer.cpp$(DependSuffix) -MM ControlElementContainer.cpp
 
@@ -414,7 +413,7 @@ $(IntermediateDirectory)/ControlElementContainer.cpp$(PreprocessSuffix): Control
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlElementContainer.cpp$(PreprocessSuffix) ControlElementContainer.cpp
 
 $(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix): ControlElementSolver.cpp $(IntermediateDirectory)/ControlElementSolver.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ControlElementSolver.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlElementSolver.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ControlElementSolver.cpp$(DependSuffix): ControlElementSolver.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlElementSolver.cpp$(DependSuffix) -MM ControlElementSolver.cpp
 
@@ -422,7 +421,7 @@ $(IntermediateDirectory)/ControlElementSolver.cpp$(PreprocessSuffix): ControlEle
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlElementSolver.cpp$(PreprocessSuffix) ControlElementSolver.cpp
 
 $(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix): Exponential.cpp $(IntermediateDirectory)/Exponential.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Exponential.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Exponential.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Exponential.cpp$(DependSuffix): Exponential.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Exponential.cpp$(DependSuffix) -MM Exponential.cpp
 
@@ -430,7 +429,7 @@ $(IntermediateDirectory)/Exponential.cpp$(PreprocessSuffix): Exponential.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Exponential.cpp$(PreprocessSuffix) Exponential.cpp
 
 $(IntermediateDirectory)/Gain.cpp$(ObjectSuffix): Gain.cpp $(IntermediateDirectory)/Gain.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Gain.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Gain.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Gain.cpp$(DependSuffix): Gain.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Gain.cpp$(DependSuffix) -MM Gain.cpp
 
@@ -438,7 +437,7 @@ $(IntermediateDirectory)/Gain.cpp$(PreprocessSuffix): Gain.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Gain.cpp$(PreprocessSuffix) Gain.cpp
 
 $(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix): IOControl.cpp $(IntermediateDirectory)/IOControl.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/IOControl.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/IOControl.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/IOControl.cpp$(DependSuffix): IOControl.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IOControl.cpp$(DependSuffix) -MM IOControl.cpp
 
@@ -446,7 +445,7 @@ $(IntermediateDirectory)/IOControl.cpp$(PreprocessSuffix): IOControl.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IOControl.cpp$(PreprocessSuffix) IOControl.cpp
 
 $(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix): Limiter.cpp $(IntermediateDirectory)/Limiter.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Limiter.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Limiter.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Limiter.cpp$(DependSuffix): Limiter.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Limiter.cpp$(DependSuffix) -MM Limiter.cpp
 
@@ -454,7 +453,7 @@ $(IntermediateDirectory)/Limiter.cpp$(PreprocessSuffix): Limiter.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Limiter.cpp$(PreprocessSuffix) Limiter.cpp
 
 $(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix): Multiplier.cpp $(IntermediateDirectory)/Multiplier.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Multiplier.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Multiplier.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Multiplier.cpp$(DependSuffix): Multiplier.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Multiplier.cpp$(DependSuffix) -MM Multiplier.cpp
 
@@ -462,7 +461,7 @@ $(IntermediateDirectory)/Multiplier.cpp$(PreprocessSuffix): Multiplier.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Multiplier.cpp$(PreprocessSuffix) Multiplier.cpp
 
 $(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix): RateLimiter.cpp $(IntermediateDirectory)/RateLimiter.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/RateLimiter.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/RateLimiter.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/RateLimiter.cpp$(DependSuffix): RateLimiter.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/RateLimiter.cpp$(DependSuffix) -MM RateLimiter.cpp
 
@@ -470,7 +469,7 @@ $(IntermediateDirectory)/RateLimiter.cpp$(PreprocessSuffix): RateLimiter.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/RateLimiter.cpp$(PreprocessSuffix) RateLimiter.cpp
 
 $(IntermediateDirectory)/Sum.cpp$(ObjectSuffix): Sum.cpp $(IntermediateDirectory)/Sum.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Sum.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Sum.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Sum.cpp$(DependSuffix): Sum.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Sum.cpp$(DependSuffix) -MM Sum.cpp
 
@@ -478,7 +477,7 @@ $(IntermediateDirectory)/Sum.cpp$(PreprocessSuffix): Sum.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Sum.cpp$(PreprocessSuffix) Sum.cpp
 
 $(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix): TransferFunction.cpp $(IntermediateDirectory)/TransferFunction.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/TransferFunction.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/TransferFunction.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TransferFunction.cpp$(DependSuffix): TransferFunction.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TransferFunction.cpp$(DependSuffix) -MM TransferFunction.cpp
 
@@ -486,7 +485,7 @@ $(IntermediateDirectory)/TransferFunction.cpp$(PreprocessSuffix): TransferFuncti
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TransferFunction.cpp$(PreprocessSuffix) TransferFunction.cpp
 
 $(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix): GraphicalElement.cpp $(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/GraphicalElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/GraphicalElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix): GraphicalElement.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix) -MM GraphicalElement.cpp
 
@@ -494,7 +493,7 @@ $(IntermediateDirectory)/GraphicalElement.cpp$(PreprocessSuffix): GraphicalEleme
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GraphicalElement.cpp$(PreprocessSuffix) GraphicalElement.cpp
 
 $(IntermediateDirectory)/Text.cpp$(ObjectSuffix): Text.cpp $(IntermediateDirectory)/Text.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Text.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Text.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Text.cpp$(DependSuffix): Text.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Text.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Text.cpp$(DependSuffix) -MM Text.cpp
 
@@ -502,7 +501,7 @@ $(IntermediateDirectory)/Text.cpp$(PreprocessSuffix): Text.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Text.cpp$(PreprocessSuffix) Text.cpp
 
 $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix): Branch.cpp $(IntermediateDirectory)/Branch.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Branch.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Branch.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Branch.cpp$(DependSuffix): Branch.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Branch.cpp$(DependSuffix) -MM Branch.cpp
 
@@ -510,7 +509,7 @@ $(IntermediateDirectory)/Branch.cpp$(PreprocessSuffix): Branch.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Branch.cpp$(PreprocessSuffix) Branch.cpp
 
 $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix): Bus.cpp $(IntermediateDirectory)/Bus.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Bus.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Bus.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Bus.cpp$(DependSuffix): Bus.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Bus.cpp$(DependSuffix) -MM Bus.cpp
 
@@ -518,7 +517,7 @@ $(IntermediateDirectory)/Bus.cpp$(PreprocessSuffix): Bus.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Bus.cpp$(PreprocessSuffix) Bus.cpp
 
 $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix): Capacitor.cpp $(IntermediateDirectory)/Capacitor.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Capacitor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Capacitor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Capacitor.cpp$(DependSuffix): Capacitor.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Capacitor.cpp$(DependSuffix) -MM Capacitor.cpp
 
@@ -526,7 +525,7 @@ $(IntermediateDirectory)/Capacitor.cpp$(PreprocessSuffix): Capacitor.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Capacitor.cpp$(PreprocessSuffix) Capacitor.cpp
 
 $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix): IndMotor.cpp $(IntermediateDirectory)/IndMotor.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/IndMotor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/IndMotor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/IndMotor.cpp$(DependSuffix): IndMotor.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IndMotor.cpp$(DependSuffix) -MM IndMotor.cpp
 
@@ -534,7 +533,7 @@ $(IntermediateDirectory)/IndMotor.cpp$(PreprocessSuffix): IndMotor.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IndMotor.cpp$(PreprocessSuffix) IndMotor.cpp
 
 $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix): Inductor.cpp $(IntermediateDirectory)/Inductor.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Inductor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Inductor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Inductor.cpp$(DependSuffix): Inductor.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Inductor.cpp$(DependSuffix) -MM Inductor.cpp
 
@@ -542,7 +541,7 @@ $(IntermediateDirectory)/Inductor.cpp$(PreprocessSuffix): Inductor.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Inductor.cpp$(PreprocessSuffix) Inductor.cpp
 
 $(IntermediateDirectory)/Line.cpp$(ObjectSuffix): Line.cpp $(IntermediateDirectory)/Line.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Line.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Line.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Line.cpp$(DependSuffix): Line.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Line.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Line.cpp$(DependSuffix) -MM Line.cpp
 
@@ -550,7 +549,7 @@ $(IntermediateDirectory)/Line.cpp$(PreprocessSuffix): Line.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Line.cpp$(PreprocessSuffix) Line.cpp
 
 $(IntermediateDirectory)/Load.cpp$(ObjectSuffix): Load.cpp $(IntermediateDirectory)/Load.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Load.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Load.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Load.cpp$(DependSuffix): Load.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Load.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Load.cpp$(DependSuffix) -MM Load.cpp
 
@@ -558,7 +557,7 @@ $(IntermediateDirectory)/Load.cpp$(PreprocessSuffix): Load.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Load.cpp$(PreprocessSuffix) Load.cpp
 
 $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix): Machines.cpp $(IntermediateDirectory)/Machines.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Machines.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Machines.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Machines.cpp$(DependSuffix): Machines.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Machines.cpp$(DependSuffix) -MM Machines.cpp
 
@@ -566,7 +565,7 @@ $(IntermediateDirectory)/Machines.cpp$(PreprocessSuffix): Machines.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Machines.cpp$(PreprocessSuffix) Machines.cpp
 
 $(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix): PowerElement.cpp $(IntermediateDirectory)/PowerElement.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/PowerElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PowerElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/PowerElement.cpp$(DependSuffix): PowerElement.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PowerElement.cpp$(DependSuffix) -MM PowerElement.cpp
 
@@ -574,7 +573,7 @@ $(IntermediateDirectory)/PowerElement.cpp$(PreprocessSuffix): PowerElement.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PowerElement.cpp$(PreprocessSuffix) PowerElement.cpp
 
 $(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix): Shunt.cpp $(IntermediateDirectory)/Shunt.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Shunt.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Shunt.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Shunt.cpp$(DependSuffix): Shunt.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Shunt.cpp$(DependSuffix) -MM Shunt.cpp
 
@@ -582,7 +581,7 @@ $(IntermediateDirectory)/Shunt.cpp$(PreprocessSuffix): Shunt.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Shunt.cpp$(PreprocessSuffix) Shunt.cpp
 
 $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix): SyncGenerator.cpp $(IntermediateDirectory)/SyncGenerator.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/SyncGenerator.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SyncGenerator.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/SyncGenerator.cpp$(DependSuffix): SyncGenerator.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SyncGenerator.cpp$(DependSuffix) -MM SyncGenerator.cpp
 
@@ -590,7 +589,7 @@ $(IntermediateDirectory)/SyncGenerator.cpp$(PreprocessSuffix): SyncGenerator.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncGenerator.cpp$(PreprocessSuffix) SyncGenerator.cpp
 
 $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix): SyncMotor.cpp $(IntermediateDirectory)/SyncMotor.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/SyncMotor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SyncMotor.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/SyncMotor.cpp$(DependSuffix): SyncMotor.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SyncMotor.cpp$(DependSuffix) -MM SyncMotor.cpp
 
@@ -598,7 +597,7 @@ $(IntermediateDirectory)/SyncMotor.cpp$(PreprocessSuffix): SyncMotor.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncMotor.cpp$(PreprocessSuffix) SyncMotor.cpp
 
 $(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix): Transformer.cpp $(IntermediateDirectory)/Transformer.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Transformer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Transformer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Transformer.cpp$(DependSuffix): Transformer.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Transformer.cpp$(DependSuffix) -MM Transformer.cpp
 
@@ -606,7 +605,7 @@ $(IntermediateDirectory)/Transformer.cpp$(PreprocessSuffix): Transformer.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Transformer.cpp$(PreprocessSuffix) Transformer.cpp
 
 $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix): GeneralPropertiesForm.cpp $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/GeneralPropertiesForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/GeneralPropertiesForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(DependSuffix): GeneralPropertiesForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GeneralPropertiesForm.cpp$(DependSuffix) -MM GeneralPropertiesForm.cpp
 
@@ -614,7 +613,7 @@ $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(PreprocessSuffix): GeneralPr
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GeneralPropertiesForm.cpp$(PreprocessSuffix) GeneralPropertiesForm.cpp
 
 $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix): SimulationsSettingsForm.cpp $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/SimulationsSettingsForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SimulationsSettingsForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(DependSuffix): SimulationsSettingsForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SimulationsSettingsForm.cpp$(DependSuffix) -MM SimulationsSettingsForm.cpp
 
@@ -622,7 +621,7 @@ $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(PreprocessSuffix): Simulat
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SimulationsSettingsForm.cpp$(PreprocessSuffix) SimulationsSettingsForm.cpp
 
 $(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix): ConstantForm.cpp $(IntermediateDirectory)/ConstantForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ConstantForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ConstantForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ConstantForm.cpp$(DependSuffix): ConstantForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ConstantForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ConstantForm.cpp$(DependSuffix) -MM ConstantForm.cpp
 
@@ -630,7 +629,7 @@ $(IntermediateDirectory)/ConstantForm.cpp$(PreprocessSuffix): ConstantForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ConstantForm.cpp$(PreprocessSuffix) ConstantForm.cpp
 
 $(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix): ControlSystemTest.cpp $(IntermediateDirectory)/ControlSystemTest.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ControlSystemTest.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlSystemTest.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ControlSystemTest.cpp$(DependSuffix): ControlSystemTest.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlSystemTest.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlSystemTest.cpp$(DependSuffix) -MM ControlSystemTest.cpp
 
@@ -638,7 +637,7 @@ $(IntermediateDirectory)/ControlSystemTest.cpp$(PreprocessSuffix): ControlSystem
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlSystemTest.cpp$(PreprocessSuffix) ControlSystemTest.cpp
 
 $(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix): ExponentialForm.cpp $(IntermediateDirectory)/ExponentialForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ExponentialForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ExponentialForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ExponentialForm.cpp$(DependSuffix): ExponentialForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ExponentialForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ExponentialForm.cpp$(DependSuffix) -MM ExponentialForm.cpp
 
@@ -646,7 +645,7 @@ $(IntermediateDirectory)/ExponentialForm.cpp$(PreprocessSuffix): ExponentialForm
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ExponentialForm.cpp$(PreprocessSuffix) ExponentialForm.cpp
 
 $(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix): GainForm.cpp $(IntermediateDirectory)/GainForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/GainForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/GainForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/GainForm.cpp$(DependSuffix): GainForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GainForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GainForm.cpp$(DependSuffix) -MM GainForm.cpp
 
@@ -654,7 +653,7 @@ $(IntermediateDirectory)/GainForm.cpp$(PreprocessSuffix): GainForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GainForm.cpp$(PreprocessSuffix) GainForm.cpp
 
 $(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix): IOControlForm.cpp $(IntermediateDirectory)/IOControlForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/IOControlForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/IOControlForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/IOControlForm.cpp$(DependSuffix): IOControlForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IOControlForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IOControlForm.cpp$(DependSuffix) -MM IOControlForm.cpp
 
@@ -662,7 +661,7 @@ $(IntermediateDirectory)/IOControlForm.cpp$(PreprocessSuffix): IOControlForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IOControlForm.cpp$(PreprocessSuffix) IOControlForm.cpp
 
 $(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix): LimiterForm.cpp $(IntermediateDirectory)/LimiterForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/LimiterForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/LimiterForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/LimiterForm.cpp$(DependSuffix): LimiterForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/LimiterForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/LimiterForm.cpp$(DependSuffix) -MM LimiterForm.cpp
 
@@ -670,7 +669,7 @@ $(IntermediateDirectory)/LimiterForm.cpp$(PreprocessSuffix): LimiterForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/LimiterForm.cpp$(PreprocessSuffix) LimiterForm.cpp
 
 $(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix): RateLimiterForm.cpp $(IntermediateDirectory)/RateLimiterForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/RateLimiterForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/RateLimiterForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/RateLimiterForm.cpp$(DependSuffix): RateLimiterForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/RateLimiterForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/RateLimiterForm.cpp$(DependSuffix) -MM RateLimiterForm.cpp
 
@@ -678,7 +677,7 @@ $(IntermediateDirectory)/RateLimiterForm.cpp$(PreprocessSuffix): RateLimiterForm
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/RateLimiterForm.cpp$(PreprocessSuffix) RateLimiterForm.cpp
 
 $(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix): SumForm.cpp $(IntermediateDirectory)/SumForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/SumForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SumForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/SumForm.cpp$(DependSuffix): SumForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SumForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SumForm.cpp$(DependSuffix) -MM SumForm.cpp
 
@@ -686,7 +685,7 @@ $(IntermediateDirectory)/SumForm.cpp$(PreprocessSuffix): SumForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SumForm.cpp$(PreprocessSuffix) SumForm.cpp
 
 $(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix): TransferFunctionForm.cpp $(IntermediateDirectory)/TransferFunctionForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/TransferFunctionForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/TransferFunctionForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TransferFunctionForm.cpp$(DependSuffix): TransferFunctionForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TransferFunctionForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TransferFunctionForm.cpp$(DependSuffix) -MM TransferFunctionForm.cpp
 
@@ -694,7 +693,7 @@ $(IntermediateDirectory)/TransferFunctionForm.cpp$(PreprocessSuffix): TransferFu
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TransferFunctionForm.cpp$(PreprocessSuffix) TransferFunctionForm.cpp
 
 $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix): TextForm.cpp $(IntermediateDirectory)/TextForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/TextForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/TextForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TextForm.cpp$(DependSuffix): TextForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TextForm.cpp$(DependSuffix) -MM TextForm.cpp
 
@@ -702,7 +701,7 @@ $(IntermediateDirectory)/TextForm.cpp$(PreprocessSuffix): TextForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TextForm.cpp$(PreprocessSuffix) TextForm.cpp
 
 $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix): BusForm.cpp $(IntermediateDirectory)/BusForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/BusForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/BusForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/BusForm.cpp$(DependSuffix): BusForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/BusForm.cpp$(DependSuffix) -MM BusForm.cpp
 
@@ -710,7 +709,7 @@ $(IntermediateDirectory)/BusForm.cpp$(PreprocessSuffix): BusForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/BusForm.cpp$(PreprocessSuffix) BusForm.cpp
 
 $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix): GeneratorStabForm.cpp $(IntermediateDirectory)/GeneratorStabForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/GeneratorStabForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/GeneratorStabForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/GeneratorStabForm.cpp$(DependSuffix): GeneratorStabForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GeneratorStabForm.cpp$(DependSuffix) -MM GeneratorStabForm.cpp
 
@@ -718,7 +717,7 @@ $(IntermediateDirectory)/GeneratorStabForm.cpp$(PreprocessSuffix): GeneratorStab
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GeneratorStabForm.cpp$(PreprocessSuffix) GeneratorStabForm.cpp
 
 $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix): IndMotorForm.cpp $(IntermediateDirectory)/IndMotorForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/IndMotorForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/IndMotorForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/IndMotorForm.cpp$(DependSuffix): IndMotorForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IndMotorForm.cpp$(DependSuffix) -MM IndMotorForm.cpp
 
@@ -726,7 +725,7 @@ $(IntermediateDirectory)/IndMotorForm.cpp$(PreprocessSuffix): IndMotorForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IndMotorForm.cpp$(PreprocessSuffix) IndMotorForm.cpp
 
 $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix): LineForm.cpp $(IntermediateDirectory)/LineForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/LineForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/LineForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/LineForm.cpp$(DependSuffix): LineForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/LineForm.cpp$(DependSuffix) -MM LineForm.cpp
 
@@ -734,7 +733,7 @@ $(IntermediateDirectory)/LineForm.cpp$(PreprocessSuffix): LineForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/LineForm.cpp$(PreprocessSuffix) LineForm.cpp
 
 $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix): LoadForm.cpp $(IntermediateDirectory)/LoadForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/LoadForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/LoadForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/LoadForm.cpp$(DependSuffix): LoadForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/LoadForm.cpp$(DependSuffix) -MM LoadForm.cpp
 
@@ -742,7 +741,7 @@ $(IntermediateDirectory)/LoadForm.cpp$(PreprocessSuffix): LoadForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/LoadForm.cpp$(PreprocessSuffix) LoadForm.cpp
 
 $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix): ReactiveShuntElementForm.cpp $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ReactiveShuntElementForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ReactiveShuntElementForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(DependSuffix): ReactiveShuntElementForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(DependSuffix) -MM ReactiveShuntElementForm.cpp
 
@@ -750,7 +749,7 @@ $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(PreprocessSuffix): Reacti
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(PreprocessSuffix) ReactiveShuntElementForm.cpp
 
 $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix): SwitchingForm.cpp $(IntermediateDirectory)/SwitchingForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/SwitchingForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SwitchingForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/SwitchingForm.cpp$(DependSuffix): SwitchingForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SwitchingForm.cpp$(DependSuffix) -MM SwitchingForm.cpp
 
@@ -758,7 +757,7 @@ $(IntermediateDirectory)/SwitchingForm.cpp$(PreprocessSuffix): SwitchingForm.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SwitchingForm.cpp$(PreprocessSuffix) SwitchingForm.cpp
 
 $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix): SyncMachineForm.cpp $(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/SyncMachineForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/SyncMachineForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix): SyncMachineForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/SyncMachineForm.cpp$(DependSuffix) -MM SyncMachineForm.cpp
 
@@ -766,7 +765,7 @@ $(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix): SyncMachineForm
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/SyncMachineForm.cpp$(PreprocessSuffix) SyncMachineForm.cpp
 
 $(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix): TransformerForm.cpp $(IntermediateDirectory)/TransformerForm.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/TransformerForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/TransformerForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TransformerForm.cpp$(DependSuffix): TransformerForm.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TransformerForm.cpp$(DependSuffix) -MM TransformerForm.cpp
 
diff --git a/Project/SyncGenerator.cpp b/Project/SyncGenerator.cpp
index 2579cef..5718090 100644
--- a/Project/SyncGenerator.cpp
+++ b/Project/SyncGenerator.cpp
@@ -59,69 +59,83 @@ bool SyncGenerator::ShowForm(wxWindow* parent, Element* element)
 SyncGeneratorElectricalData SyncGenerator::GetPUElectricalData(double systemPowerBase)
 {
     SyncGeneratorElectricalData data = m_electricalData;
-    switch(data.activePowerUnit) {
-        case UNIT_W: {
-            data.activePower = data.activePower / systemPowerBase;
-            data.activePowerUnit = UNIT_PU;
-        } break;
-        case UNIT_kW: {
-            data.activePower = (data.activePower * 1e3) / systemPowerBase;
-            data.activePowerUnit = UNIT_PU;
-        } break;
-        case UNIT_MW: {
-            data.activePower = (data.activePower * 1e6) / systemPowerBase;
-            data.activePowerUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    double machineBasePower = 1.0;
+    if(data.useMachineBase) {
+        machineBasePower = GetValueFromUnit(data.nominalPower, data.nominalPowerUnit);
     }
-    switch(data.reactivePowerUnit) {
-        case UNIT_VAr: {
-            data.reactivePower = data.reactivePower / systemPowerBase;
-            data.reactivePowerUnit = UNIT_PU;
-        } break;
-        case UNIT_kVAr: {
-            data.reactivePower = (data.reactivePower * 1e3) / systemPowerBase;
-            data.reactivePowerUnit = UNIT_PU;
-        } break;
-        case UNIT_MVAr: {
-            data.reactivePower = (data.reactivePower * 1e6) / systemPowerBase;
-            data.reactivePowerUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+
+    // Active power
+    double activePower = GetValueFromUnit(data.activePower, data.activePowerUnit);
+    if(!m_online) activePower = 0.0;
+    if(data.activePowerUnit == UNIT_PU) {
+        if(data.useMachineBase) data.activePower = (activePower * machineBasePower) / systemPowerBase;
+    } else {
+        data.activePower = activePower / systemPowerBase;
     }
-    switch(data.maxReactiveUnit) {
-        case UNIT_VAr: {
-            data.maxReactive = data.maxReactive / systemPowerBase;
-            data.maxReactiveUnit = UNIT_PU;
-        } break;
-        case UNIT_kVAr: {
-            data.maxReactive = (data.maxReactive * 1e3) / systemPowerBase;
-            data.maxReactiveUnit = UNIT_PU;
-        } break;
-        case UNIT_MVAr: {
-            data.maxReactive = (data.maxReactive * 1e6) / systemPowerBase;
-            data.maxReactiveUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    data.activePowerUnit = UNIT_PU;
+
+    // Reactive power
+    double reactivePower = GetValueFromUnit(data.reactivePower, data.reactivePowerUnit);
+    if(!m_online) reactivePower = 0.0;
+    if(data.reactivePowerUnit == UNIT_PU) {
+        if(data.useMachineBase) data.reactivePower = (reactivePower * machineBasePower) / systemPowerBase;
+    } else {
+        data.reactivePower = reactivePower / systemPowerBase;
     }
-    switch(data.minReactiveUnit) {
-        case UNIT_VAr: {
-            data.minReactive = data.minReactive / systemPowerBase;
-            data.minReactiveUnit = UNIT_PU;
-        } break;
-        case UNIT_kVAr: {
-            data.minReactive = (data.minReactive * 1e3) / systemPowerBase;
-            data.minReactiveUnit = UNIT_PU;
-        } break;
-        case UNIT_MVAr: {
-            data.minReactive = (data.minReactive * 1e6) / systemPowerBase;
-            data.minReactiveUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    data.reactivePowerUnit = UNIT_PU;
+
+    // Max reactive power
+    double maxReactive = GetValueFromUnit(data.maxReactive, data.maxReactiveUnit);
+    if(data.maxReactiveUnit == UNIT_PU) {
+        if(data.useMachineBase) data.maxReactive = (maxReactive * machineBasePower) / systemPowerBase;
+    } else {
+        data.maxReactive = maxReactive / systemPowerBase;
+    }
+    data.maxReactiveUnit = UNIT_PU;
+
+    // Min reactive power
+    double minReactive = GetValueFromUnit(data.minReactive, data.minReactiveUnit);
+    if(data.minReactiveUnit == UNIT_PU) {
+        if(data.useMachineBase) data.minReactive = (minReactive * machineBasePower) / systemPowerBase;
+    } else {
+        data.minReactive = minReactive / systemPowerBase;
+    }
+    data.minReactiveUnit = UNIT_PU;
+
+    double baseVoltage = GetValueFromUnit(data.nominalVoltage, data.nominalVoltageUnit);
+    double systemBaseImpedance = (baseVoltage * baseVoltage) / systemPowerBase;
+    double machineBaseImpedance = (baseVoltage * baseVoltage) / machineBasePower;
+
+    // Fault data
+
+    // Pos. seq. resistance
+    double r1 = data.positiveResistance;
+    if(data.useMachineBase) data.positiveResistance = (r1 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Pos. seq. reactance
+    double x1 = data.positiveReactance;
+    if(data.useMachineBase) data.positiveReactance = (x1 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Neg. seq. resistance
+    double r2 = data.negativeResistance;
+    if(data.useMachineBase) data.negativeResistance = (r2 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Neg. seq. reactance
+    double x2 = data.negativeReactance;
+    if(data.useMachineBase) data.negativeReactance = (x2 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Zero seq. resistance
+    double r0 = data.zeroResistance;
+    if(data.useMachineBase) data.zeroResistance = (r0 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Zero seq. reactance
+    double x0 = data.zeroReactance;
+    if(data.useMachineBase) data.zeroReactance = (x0 * machineBaseImpedance) / systemBaseImpedance;
+    
+    if(!m_online) {
+        data.faultCurrent[0] = std::complex<double>(0,0);
+        data.faultCurrent[1] = std::complex<double>(0,0);
+        data.faultCurrent[2] = std::complex<double>(0,0);
     }
 
     return data;
diff --git a/Project/SyncGenerator.h b/Project/SyncGenerator.h
index fb5ffdc..23ab87d 100644
--- a/Project/SyncGenerator.h
+++ b/Project/SyncGenerator.h
@@ -4,8 +4,6 @@
 #include "Machines.h"
 
 class SyncMachineForm;
-class ControlElementContainer;
-class ControlElementSolver;
 
 struct SyncGeneratorElectricalData {
     // General
diff --git a/Project/SyncMotor.cpp b/Project/SyncMotor.cpp
index c1e1986..c4a61d8 100644
--- a/Project/SyncMotor.cpp
+++ b/Project/SyncMotor.cpp
@@ -1,15 +1,8 @@
 #include "SyncMachineForm.h"
 #include "SyncMotor.h"
 
-SyncMotor::SyncMotor()
-    : Machines()
-{
-}
-SyncMotor::SyncMotor(wxString name)
-    : Machines()
-{
-    m_electricalData.name = name;
-}
+SyncMotor::SyncMotor() : Machines() {}
+SyncMotor::SyncMotor(wxString name) : Machines() { m_electricalData.name = name; }
 SyncMotor::~SyncMotor() {}
 void SyncMotor::DrawSymbol() const { DrawArc(m_position, 12, 30, 330, 10, GL_LINE_STRIP); }
 bool SyncMotor::GetContextMenu(wxMenu& menu)
@@ -36,75 +29,96 @@ bool SyncMotor::ShowForm(wxWindow* parent, Element* element)
 SyncMotorElectricalData SyncMotor::GetPUElectricalData(double systemPowerBase)
 {
     SyncMotorElectricalData data = m_electricalData;
+    double machineBasePower = 1.0;
+    if(data.useMachineBase) {
+        machineBasePower = GetValueFromUnit(data.nominalPower, data.nominalPowerUnit);
+    }
 
-    switch(data.activePowerUnit) {
-        case UNIT_W: {
-            data.activePower = data.activePower / systemPowerBase;
-            data.activePowerUnit = UNIT_PU;
-        } break;
-        case UNIT_kW: {
-            data.activePower = (data.activePower * 1e3) / systemPowerBase;
-            data.activePowerUnit = UNIT_PU;
-        } break;
-        case UNIT_MW: {
-            data.activePower = (data.activePower * 1e6) / systemPowerBase;
-            data.activePowerUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    // Active power
+    double activePower = GetValueFromUnit(data.activePower, data.activePowerUnit);
+    if(!m_online) activePower = 0.0;
+    if(data.activePowerUnit == UNIT_PU) {
+        if(data.useMachineBase) data.activePower = (activePower * machineBasePower) / systemPowerBase;
+    } else {
+        data.activePower = activePower / systemPowerBase;
     }
-    switch(data.reactivePowerUnit) {
-        case UNIT_VAr: {
-            data.reactivePower = data.reactivePower / systemPowerBase;
-            data.reactivePowerUnit = UNIT_PU;
-        } break;
-        case UNIT_kVAr: {
-            data.reactivePower = (data.reactivePower * 1e3) / systemPowerBase;
-            data.reactivePowerUnit = UNIT_PU;
-        } break;
-        case UNIT_MVAr: {
-            data.reactivePower = (data.reactivePower * 1e6) / systemPowerBase;
-            data.reactivePowerUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    data.activePowerUnit = UNIT_PU;
+
+    // Reactive power
+    double reactivePower = GetValueFromUnit(data.reactivePower, data.reactivePowerUnit);
+    if(!m_online) reactivePower = 0.0;
+    if(data.reactivePowerUnit == UNIT_PU) {
+        if(data.useMachineBase) data.reactivePower = (reactivePower * machineBasePower) / systemPowerBase;
+    } else {
+        data.reactivePower = reactivePower / systemPowerBase;
     }
-    switch(data.maxReactiveUnit) {
-        case UNIT_VAr: {
-            data.maxReactive = data.maxReactive / systemPowerBase;
-            data.maxReactiveUnit = UNIT_PU;
-        } break;
-        case UNIT_kVAr: {
-            data.maxReactive = (data.maxReactive * 1e3) / systemPowerBase;
-            data.maxReactiveUnit = UNIT_PU;
-        } break;
-        case UNIT_MVAr: {
-            data.maxReactive = (data.maxReactive * 1e6) / systemPowerBase;
-            data.maxReactiveUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    data.reactivePowerUnit = UNIT_PU;
+
+    // Max reactive power
+    double maxReactive = GetValueFromUnit(data.maxReactive, data.maxReactiveUnit);
+    if(data.maxReactiveUnit == UNIT_PU) {
+        if(data.useMachineBase) data.maxReactive = (maxReactive * machineBasePower) / systemPowerBase;
+    } else {
+        data.maxReactive = maxReactive / systemPowerBase;
     }
-    switch(data.minReactiveUnit) {
-        case UNIT_VAr: {
-            data.minReactive = data.minReactive / systemPowerBase;
-            data.minReactiveUnit = UNIT_PU;
-        } break;
-        case UNIT_kVAr: {
-            data.minReactive = (data.minReactive * 1e3) / systemPowerBase;
-            data.minReactiveUnit = UNIT_PU;
-        } break;
-        case UNIT_MVAr: {
-            data.minReactive = (data.minReactive * 1e6) / systemPowerBase;
-            data.minReactiveUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    data.maxReactiveUnit = UNIT_PU;
+
+    // Min reactive power
+    double minReactive = GetValueFromUnit(data.minReactive, data.minReactiveUnit);
+    if(data.minReactiveUnit == UNIT_PU) {
+        if(data.useMachineBase) data.minReactive = (minReactive * machineBasePower) / systemPowerBase;
+    } else {
+        data.minReactive = minReactive / systemPowerBase;
+    }
+    data.minReactiveUnit = UNIT_PU;
+
+    double baseVoltage = GetValueFromUnit(data.nominalVoltage, data.nominalVoltageUnit);
+    double systemBaseImpedance = (baseVoltage * baseVoltage) / systemPowerBase;
+    double machineBaseImpedance = (baseVoltage * baseVoltage) / machineBasePower;
+
+    // Fault data
+
+    // Pos. seq. resistance
+    double r1 = data.positiveResistance;
+    if(data.useMachineBase) data.positiveResistance = (r1 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Pos. seq. reactance
+    double x1 = data.positiveReactance;
+    if(data.useMachineBase) data.positiveReactance = (x1 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Neg. seq. resistance
+    double r2 = data.negativeResistance;
+    if(data.useMachineBase) data.negativeResistance = (r2 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Neg. seq. reactance
+    double x2 = data.negativeReactance;
+    if(data.useMachineBase) data.negativeReactance = (x2 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Zero seq. resistance
+    double r0 = data.zeroResistance;
+    if(data.useMachineBase) data.zeroResistance = (r0 * machineBaseImpedance) / systemBaseImpedance;
+
+    // Zero seq. reactance
+    double x0 = data.zeroReactance;
+    if(data.useMachineBase) data.zeroReactance = (x0 * machineBaseImpedance) / systemBaseImpedance;
+    
+    if(!m_online) {
+        data.faultCurrent[0] = std::complex<double>(0,0);
+        data.faultCurrent[1] = std::complex<double>(0,0);
+        data.faultCurrent[2] = std::complex<double>(0,0);
     }
 
     return data;
 }
 
+void SyncMotor::SetNominalVoltage(std::vector<double> nominalVoltage, std::vector<ElectricalUnit> nominalVoltageUnit)
+{
+    if(nominalVoltage.size() > 0) {
+        m_electricalData.nominalVoltage = nominalVoltage[0];
+        m_electricalData.nominalVoltageUnit = nominalVoltageUnit[0];
+    }
+}
+
 Element* SyncMotor::GetCopy()
 {
     SyncMotor* copy = new SyncMotor();
diff --git a/Project/SyncMotor.h b/Project/SyncMotor.h
index 7018e5d..f6f21c4 100644
--- a/Project/SyncMotor.h
+++ b/Project/SyncMotor.h
@@ -10,6 +10,8 @@ struct SyncMotorElectricalData {
     wxString name = "";
     double nominalPower = 100.0;
     ElectricalUnit nominalPowerUnit = UNIT_MVA;
+    double nominalVoltage = 13.8;
+    ElectricalUnit nominalVoltageUnit = UNIT_kV;
     double activePower = 100.0;
     ElectricalUnit activePowerUnit = UNIT_MW;
     double reactivePower = 0.0;
@@ -20,7 +22,7 @@ struct SyncMotorElectricalData {
     bool haveMinReactive = false;
     double minReactive = -9999.0;
     ElectricalUnit minReactiveUnit = UNIT_MVAr;
-    bool useMachineBase = false;
+    bool useMachineBase = true;
 
     // Fault
     double positiveResistance = 0.0;
@@ -33,12 +35,12 @@ struct SyncMotorElectricalData {
     double groundReactance = 0.0;
     bool groundNeutral = true;
     // p.u. fault data
-    std::complex<double> faultCurrent[3] = { std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0),
-        std::complex<double>(0.0, 0.0) };
+    std::complex<double> faultCurrent[3] = {std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0),
+                                            std::complex<double>(0.0, 0.0)};
 
     // Stability
     bool plotSyncMachine = false;
-    double inertia = 0.0;
+    double inertia = 1.0;
     double damping = 0.0;
     bool useAVR = false;
     bool useSpeedGovernor = false;
@@ -57,6 +59,52 @@ struct SyncMotorElectricalData {
     double subXq = 0.0;
     double subTd0 = 0.0;
     double subTq0 = 0.0;
+
+    // Machine state variables
+    std::complex<double> terminalVoltage;
+    std::vector<std::complex<double> > terminalVoltageVector;
+    std::complex<double> electricalPower;
+    std::vector<std::complex<double> > electricalPowerVector;
+    double pm;
+    std::vector<double> mechanicalPowerVector;
+    double speed;
+    std::vector<double> freqVector;
+    double fieldVoltage;
+    std::vector<double> fieldVoltageVector;
+    double delta;
+    std::vector<double> deltaVector;
+
+    double initialFieldVoltage;
+
+    // Internal machine variables
+    double tranEq;
+    double tranEd;
+    double subEq;
+    double subEd;
+    double pe;
+
+    // Variables to extrapolate
+    double oldId;
+    double oldIq;
+    double oldPe;
+
+    // Integration constants
+    IntegrationConstant icSpeed;
+    IntegrationConstant icDelta;
+    IntegrationConstant icTranEq;
+    IntegrationConstant icTranEd;
+    IntegrationConstant icSubEq;
+    IntegrationConstant icSubEd;
+
+    // Control
+    ControlElementContainer* avr = NULL;
+    ControlElementContainer* speedGov = NULL;
+
+    // Control solvers
+    ControlElementSolver* avrSolver = NULL;
+    ControlElementSolver* speedGovSolver = NULL;
+
+    Machines::SyncMachineModel model = Machines::SM_MODEL_1;
 };
 
 class SyncMotor : public Machines
@@ -65,13 +113,14 @@ class SyncMotor : public Machines
     SyncMotor();
     SyncMotor(wxString name);
     ~SyncMotor();
-	
-	virtual Element* GetCopy();
+
+    virtual Element* GetCopy();
     virtual void DrawSymbol() const;
     virtual bool GetContextMenu(wxMenu& menu);
     virtual wxString GetTipText() const;
     virtual SyncMotorElectricalData GetElectricalData() { return m_electricalData; }
-	virtual SyncMotorElectricalData GetPUElectricalData(double systemPowerBase);
+    virtual SyncMotorElectricalData GetPUElectricalData(double systemPowerBase);
+    virtual void SetNominalVoltage(std::vector<double> nominalVoltage, std::vector<ElectricalUnit> nominalVoltageUnit);
     virtual void SetElectricalData(SyncMotorElectricalData electricalData) { m_electricalData = electricalData; }
     virtual bool ShowForm(wxWindow* parent, Element* element);
 
diff --git a/Project/Transformer.cpp b/Project/Transformer.cpp
index 9ac1e97..8f8ecb5 100644
--- a/Project/Transformer.cpp
+++ b/Project/Transformer.cpp
@@ -445,59 +445,72 @@ wxString Transformer::GetTipText() const
     return tipText;
 }
 
-TransformerElectricalData Transformer::GetPUElectricalData(double basePower) const
+TransformerElectricalData Transformer::GetPUElectricalData(double systemBasePower)
 {
     TransformerElectricalData data = m_electricalData;
-    double transformerBasePower = basePower;
-    if(m_electricalData.useTransformerPower) {
-        transformerBasePower = m_electricalData.nominalPower;
-        switch(m_electricalData.nominalPowerUnit) {
-            case UNIT_MVA: {
-                transformerBasePower *= 1e6;
-            } break;
-            case UNIT_kVA: {
-                transformerBasePower *= 1e3;
-            } break;
-            default:
-                break;
-        }
-    }
-    double vb = 0.0;
-    if(m_electricalData.baseVoltage == 0) {
-        vb = m_electricalData.primaryNominalVoltage;
-        if(m_electricalData.primaryNominalVoltageUnit == UNIT_kV) vb *= 1e3;
+    double transformerBasePower = GetValueFromUnit(data.nominalPower, data.nominalPowerUnit);
+    double baseVoltage = 0.0;
+    if(data.baseVoltage == 0) {
+        baseVoltage = GetValueFromUnit(data.primaryNominalVoltage, data.primaryNominalVoltageUnit);
     } else {
-        vb = m_electricalData.secondaryNominalVoltage;
-        if(m_electricalData.secondaryNominalVoltageUnit == UNIT_kV) vb *= 1e3;
+        baseVoltage = GetValueFromUnit(data.secondaryNominalVoltage, data.secondaryNominalVoltageUnit);
     }
-    double zb = (vb * vb) / basePower;
+    double systemBaseImpedance = (baseVoltage * baseVoltage) / systemBasePower;
+    double transformerBaseImpedance = (baseVoltage * baseVoltage) / transformerBasePower;
 
     // Resistance
     double r = data.resistance;
-    switch(data.resistanceUnit) {
-        case UNIT_PU: {
-            if(m_electricalData.useTransformerPower) data.resistance = (basePower / transformerBasePower) * r;
-        } break;
-        case UNIT_OHM: {
-            data.resistance = r / zb;
-            data.resistanceUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    if(data.resistanceUnit ==  UNIT_PU) {
+        if(data.useTransformerPower) data.resistance = (r * transformerBaseImpedance) / systemBaseImpedance;
+    } else {
+        data.resistance = r / systemBaseImpedance;
     }
+    data.resistanceUnit = UNIT_PU;
 
     // Indutive reactance
-    double xl = data.indReactance;
-    switch(data.indReactanceUnit) {
-        case UNIT_PU: {
-            if(m_electricalData.useTransformerPower) data.indReactance = (basePower / transformerBasePower) * xl;
-        } break;
-        case UNIT_OHM: {
-            data.indReactance = xl / zb;
-            data.indReactanceUnit = UNIT_PU;
-        } break;
-        default:
-            break;
+    double x = data.indReactance;
+    if(data.indReactanceUnit == UNIT_PU) {
+        if(data.useTransformerPower) data.indReactance = (x * transformerBaseImpedance) / systemBaseImpedance;
+    } else {
+        data.indReactance = x / systemBaseImpedance;
+    }
+    data.indReactanceUnit = UNIT_PU;
+
+    // Fault
+
+    // Zero seq. resistance
+    double r0 = data.zeroResistance;
+    if(data.useTransformerPower) data.zeroResistance = (r0 * transformerBaseImpedance) / systemBaseImpedance;
+
+    // Zero seq. ind. reactance
+    double x0 = data.zeroIndReactance;
+    if(data.useTransformerPower) data.zeroIndReactance = (x0 * transformerBaseImpedance) / systemBaseImpedance;
+
+    // Primary ground resistance
+    double rgp = data.primaryGrndResistance;
+    if(data.useTransformerPower) data.primaryGrndResistance = (rgp * transformerBaseImpedance) / systemBaseImpedance;
+
+    // Primary ground ind reactance
+    double xgp = data.primaryGrndReactance;
+    if(data.useTransformerPower) data.primaryGrndReactance = (xgp * transformerBaseImpedance) / systemBaseImpedance;
+
+    // Secondary ground resistance
+    double rgs = data.secondaryGrndResistance;
+    if(data.useTransformerPower) data.secondaryGrndResistance = (rgs * transformerBaseImpedance) / systemBaseImpedance;
+
+    // Secondary ground ind reactance
+    double xgs = data.secondaryGrndReactance;
+    if(data.useTransformerPower) data.secondaryGrndReactance = (xgs * transformerBaseImpedance) / systemBaseImpedance;
+    
+    if(!m_online) {
+        data.powerFlow[0] = std::complex<double>(0,0);
+        data.powerFlow[1] = std::complex<double>(0,0);
+        data.faultCurrent[0][0] = std::complex<double>(0,0);
+        data.faultCurrent[0][1] = std::complex<double>(0,0);
+        data.faultCurrent[0][2] = std::complex<double>(0,0);
+        data.faultCurrent[1][0] = std::complex<double>(0,0);
+        data.faultCurrent[1][1] = std::complex<double>(0,0);
+        data.faultCurrent[1][2] = std::complex<double>(0,0);
     }
 
     return data;
diff --git a/Project/Transformer.h b/Project/Transformer.h
index 04b114f..689b8f6 100644
--- a/Project/Transformer.h
+++ b/Project/Transformer.h
@@ -74,7 +74,7 @@ public:
     virtual void SetPowerFlowDirection(PowerFlowDirection pfDirection);
     virtual bool ShowForm(wxWindow* parent, Element* element);
     virtual TransformerElectricalData GetElectricalData() const { return m_electricalData; }
-    virtual TransformerElectricalData GetPUElectricalData(double basePower) const;
+    virtual TransformerElectricalData GetPUElectricalData(double systemBasePower);
     virtual void SetElectricaData(TransformerElectricalData electricalData) { m_electricalData = electricalData; }
     virtual void SetNominalVoltage(std::vector<double> nominalVoltage, std::vector<ElectricalUnit> nominalVoltageUnit);