diff --git a/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb b/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb
index b563eeed7bd4ab28f0539450b8e47e7e58757e68..2a088a0af29d3f8c3ef43a9e5aa7caa6dc9d089d 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb
@@ -4,6 +4,78 @@ Namespace Electrics
 
 Public Class M0_5_SmartAlternatorSetEfficiency
 
+private _m0 As IM0_NonSmart_AlternatorsSetEfficiency
+Private _electricalConsumables As IElectricalConsumerList
+Private _alternatorMap As IAlternatorMap
+Private _resultCardIdle As IResultCard
+Private _resultCardTraction As IResultCard
+Private _resultCardOverrun As IResultCard
+
+
+Public ReadOnly Property SmartIdleCurrent As single
+    Get
+
+    End Get
+End Property
+Public ReadOnly Property AlternatorsEfficiencyIdleResultCard As single
+    Get
+
+    End Get
+End Property
+
+
+Public readonly Property SmartTractionCurrent As Single
+    Get
+
+    End Get
+End Property
+Public readonly Property AlternatorsEfficiencyTractionOnResultCard As Single
+    Get
+
+    End Get
+End Property
+
+
+Public ReadOnly Property SmartOverrunCurrent As Single
+    Get
+
+    End Get
+End Property
+Public ReadOnly Property AlternatorsEfficiencyOverrunResultCard As single
+    Get
+
+    End Get
+End Property
+
+
+
+Public Sub new ( m0 As IM0_NonSmart_AlternatorsSetEfficiency, _
+                 electricalConsumables as IElectricalConsumerList, _ 
+                 alternatorMap As IAlternatorMap, _
+                 resultCardIdle As IResultCard, _
+                 resultCardTraction As IResultCard, _
+                 resultCardOverrun As IResultCard)
+
+                 'Sanity Check on supplied arguments, throw an argument exception
+                 If m0 is Nothing  then Throw New ArgumentException("Module 0 must be supplied")
+                 If electricalConsumables is Nothing then Throw New ArgumentException("ElectricalConsumablesList must be supplied even if empty")   
+                 If alternatorMap        is Nothing then throw new ArgumentException("Must supply a valid alternator map")
+                 if  resultCardIdle      is nothing then throw new ArgumentException("Result Card 'IDLE' must be supplied even if it has no contents")
+                 if  resultCardTraction  is nothing then throw new ArgumentException("Result Card 'TRACTION' must be supplied even if it has no contents")
+                 if  resultCardOverrun   is nothing then throw new ArgumentException("Result Card 'OVERRUN' must be supplied even if it has no contents")               
+ 
+                 'Assignments to private variables.
+                 _electricalConsumables   = electricalConsumables
+                 _alternatorMap           = alternatorMap
+                 _resultCardIdle          = resultCardIdle
+                 _resultCardTraction      = resultCardTraction
+                 _resultCardOverrun       = resultCardOverrun
+                                                                                                                             
+End Sub                                      
+
+
+
+
 End Class
 
 End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/AverageHVACLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
similarity index 97%
rename from VECTOAux/VectoAuxiliaries/Hvac/AverageHVACLoadDemand.vb
rename to VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
index bc349f24cab0fd3ea5c558103bf2a641fd72f0ce..fb022ca806862f51b66cbfbee2a6a22d7706cd36 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/AverageHVACLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
@@ -1,7 +1,8 @@
 Imports VectoAuxiliaries.Electrics
 
 Namespace Hvac
-    Public Class AverageHVACLoadDemand
+
+    Public Class M1_AverageHVACLoadDemand
 
         Dim map As IHVACMap
         Dim alternator As IAlternator
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/AveragePneumaticLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
similarity index 99%
rename from VECTOAux/VectoAuxiliaries/Pneumatics/AveragePneumaticLoadDemand.vb
rename to VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
index effa8efbf2753f8c6fced97b4f0370df9543a8c4..99abc326ad83ed5bb93ec36918b032b21f545a4f 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/AveragePneumaticLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
@@ -2,7 +2,7 @@
 
 Namespace Pneumatics
 
-    Public Class AveragePneumaticLoadDemand
+    Public Class M3_AveragePneumaticLoadDemand
 
 
         Private _pneumaticUserInputsConfig As IPneumaticUserInputsConfig
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 1c3fa98569681ac10e89fb025f7ed8ca435b3849..168d33cfd1357fc1d561961f64322536e5f3dced 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -93,8 +93,8 @@
     <Compile Include="Electrics\Alternator.vb" />
     <Compile Include="Electrics\AlternatorMap.vb" />
     <Compile Include="Electrics\M2_AverageElectricalLoadDemand.vb" />
-    <Compile Include="Hvac\AverageHVACLoadDemand.vb" />
-    <Compile Include="Pneumatics\AveragePneumaticLoadDemand.vb" />
+    <Compile Include="Hvac\M1_AverageHVACLoadDemand.vb" />
+    <Compile Include="Pneumatics\M3_AveragePneumaticLoadDemand.vb" />
     <Compile Include="Pneumatics\CompressorMap.vb" />
     <Compile Include="Electrics\ElectricalConsumer.vb" />
     <Compile Include="Hvac\HVACMap.vb" />