diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index f2227ea0..7e6a20b9 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -698,13 +698,17 @@
 					<Name><![CDATA[MAX_POWER]]></Name>
 				</Option>
 				<Option>
-					<Id>1755703015841</Id>
-					<Name><![CDATA[CUSTOM]]></Name>
+					<Id>1765536978989</Id>
+					<Name><![CDATA[OFF_PEAK_INTERVAL]]></Name>
 				</Option>
 				<Option>
 					<Id>1762853393712</Id>
 					<Name><![CDATA[NONE]]></Name>
 				</Option>
+				<Option>
+					<Id>1755703015841</Id>
+					<Name><![CDATA[CUSTOM]]></Name>
+				</Option>
 			</OptionList>
 			<OptionList>
 				<Id>1668693527446</Id>
@@ -1117,6 +1121,7 @@
 			<Folder>
 				<Id>1752681631114</Id>
 				<Name><![CDATA[GIS]]></Name>
+				<ParentId>1752677832758</ParentId>
 			</Folder>
 			<Folder>
 				<Id>1752681639768</Id>
@@ -1164,6 +1169,11 @@
 				<Name><![CDATA[AggregatorBatteryManagement]]></Name>
 				<ParentId>1762850958928</ParentId>
 			</Folder>
+			<Folder>
+				<Id>1764938574089</Id>
+				<Name><![CDATA[Globals]]></Name>
+				<ParentId>1752680962144</ParentId>
+			</Folder>
 		</Folders>
 		<ActiveObjectClasses/>
 		<DifferentialEquationsMethod>EULER</DifferentialEquationsMethod>
@@ -1537,17 +1547,6 @@
 				<Name><![CDATA[J_EAAirco]]></Name>
 				<Folder>1752677832758</Folder>
 			</JavaClass>
-			<JavaClass>
-				<Id>1749649002419</Id>
-				<Name><![CDATA[J_ChargingSession]]></Name>
-				<Folder>1752680962144</Folder>
-			</JavaClass>
-			<JavaClass>
-				<Id>1749651263461</Id>
-				<Name><![CDATA[J_EACharger]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<Folder>1752677832758</Folder>
-			</JavaClass>
 			<JavaClass>
 				<Id>1752677257516</Id>
 				<Name><![CDATA[I_BatteryManagement]]></Name>
@@ -1714,11 +1713,6 @@
 				<Name><![CDATA[J_BatteryManagementSelfConsumption]]></Name>
 				<Folder>1762850659543</Folder>
 			</JavaClass>
-			<JavaClass>
-				<Id>1755171209007</Id>
-				<Name><![CDATA[J_EAChargePoint]]></Name>
-				<Folder>1752677832758</Folder>
-			</JavaClass>
 			<JavaClass>
 				<Id>1755518393955</Id>
 				<Name><![CDATA[J_ChargingManagementMaxAvailablePower]]></Name>
@@ -1802,6 +1796,46 @@
 			<JavaClass>
 				<Id>1763570262548</Id>
 				<Name><![CDATA[J_GlobalParameters]]></Name>
+				<Folder>1764938574089</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1764337491572</Id>
+				<Name><![CDATA[I_ChargingRequest]]></Name>
+				<Folder>1762850586274</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1764936717326</Id>
+				<Name><![CDATA[J_TimeVariables]]></Name>
+				<Folder>1752680962144</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1764936749914</Id>
+				<Name><![CDATA[J_TimeParameters]]></Name>
+				<Folder>1752680962144</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1765192207409</Id>
+				<Name><![CDATA[J_EAChargingSession]]></Name>
+				<Folder>1752677832758</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1765383541339</Id>
+				<Name><![CDATA[J_ChargePoint]]></Name>
+				<Folder>1762850586274</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1765537283263</Id>
+				<Name><![CDATA[J_ChargingManagementGridBalancing]]></Name>
+				<Folder>1762850586274</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1765878809347</Id>
+				<Name><![CDATA[I_ChargePointRegistration]]></Name>
+				<Folder>1762850586274</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1765901157331</Id>
+				<Name><![CDATA[J_ChargingSessionData]]></Name>
 				<Folder>1752680962144</Folder>
 			</JavaClass>
 		</JavaClasses>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 2008244e..24b325f3 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -129,20 +129,23 @@
 v_totalBatteryEnergyUsed_MWh = 0;
 
 for(J_EA ea : c_energyAssets) { // Single loop of all assets without using c_EVs and c_storageAssets
-	if( ea instanceof J_EAStorageElectric ) {
-		J_EAStorageElectric e = (J_EAStorageElectric)ea;
-		v_totalBatteryDischargeAmount_MWh += e.getTotalDischargeAmount_kWh() / 1000;
-		v_totalBatteryChargeAmount_MWh += e.getTotalChargeAmount_kWh() / 1000;
-		v_totalBatteryEnergyUsed_MWh += e.getEnergyUsed_kWh() / 1000;
+	if( ea instanceof J_EAStorageElectric storageElectric) {
+		v_totalBatteryDischargeAmount_MWh += storageElectric.getTotalDischargeAmount_kWh() / 1000;
+		v_totalBatteryChargeAmount_MWh += storageElectric.getTotalChargeAmount_kWh() / 1000;
+		v_totalBatteryEnergyUsed_MWh += storageElectric.getEnergyUsed_kWh() / 1000;
 	}
 	
-	if( ea instanceof J_EAEV ) {
-		J_EAEV e = (J_EAEV)ea;
-		v_totalBatteryDischargeAmount_MWh += e.getTotalDischargeAmount_kWh() / 1000;
-		v_totalBatteryChargeAmount_MWh += e.getTotalChargeAmount_kWh() / 1000;
-		v_totalBatteryEnergyUsed_MWh += e.getEnergyUsed_kWh() / 1000;
+	if( ea instanceof J_EAEV ev) {
+		v_totalBatteryDischargeAmount_MWh += ev.getTotalDischargeAmount_kWh() / 1000;
+		v_totalBatteryChargeAmount_MWh += ev.getTotalChargeAmount_kWh() / 1000;
+		v_totalBatteryEnergyUsed_MWh += ev.getEnergyUsed_kWh() / 1000;
 	}
 	
+	if( ea instanceof J_EAChargingSession cs) {
+		v_totalBatteryDischargeAmount_MWh += cs.getTotalDischargeAmount_kWh() / 1000;
+		v_totalBatteryChargeAmount_MWh += cs.getTotalChargeAmount_kWh() / 1000;
+		v_totalBatteryEnergyUsed_MWh += cs.getEnergyUsed_kWh() / 1000;
+	}
 }
 
 //Calculate delta stored energy in battery for energy balance check
@@ -267,8 +270,8 @@
 	
 	GC.c_tripTrackers.forEach(tt->{
 		tt.storeAndResetState();
-		tt.setStartIndex(p_runStartTime_h);
-		tt.prepareNextActivity(p_runStartTime_h*60);
+		tt.setStartIndex(p_runStartTime_h, GC.f_getChargePoint());
+		//tt.prepareNextActivity(p_runStartTime_h*60, GC.f_getChargePoint());
 		});
 	if (GC instanceof GCHouse) {
 		if (((GCHouse)GC).p_cookingTracker != null) {
@@ -407,7 +410,7 @@
 	GC.f_resetStatesAfterRapidRun();
 	GC.c_tripTrackers.forEach(tt->{
 		tt.restoreState();
-		tt.prepareNextActivity((t_h-p_runStartTime_h)*60);
+		//tt.prepareNextActivity((t_h-p_runStartTime_h)*60, GC.f_getChargePoint());
 		});	
 	//GC.c_tripTrackers.forEach(tt->tt.prepareNextActivity((t_h-p_runStartTime_h)*60));
 	if (GC instanceof GCHouse) {
@@ -484,6 +487,9 @@
 //Update t_h
 t_h = p_runStartTime_h + v_timeStepsElapsed * p_timeStep_h;
 
+//Update time variables
+J_TimeVariables.updateTimeVariables(v_timeStepsElapsed);
+
 // Update tijdreeksen in leesbare variabelen
 f_updateTimeseries(t_h);
 
diff --git a/_alp/Agents/EnergyModel/Variables.xml b/_alp/Agents/EnergyModel/Variables.xml
index db6773c0..ca82027e 100644
--- a/_alp/Agents/EnergyModel/Variables.xml
+++ b/_alp/Agents/EnergyModel/Variables.xml
@@ -1998,6 +1998,62 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1765189970308</Id>
+		<Name><![CDATA[p_timeVariables]]></Name>
+		<X>-610</X>
+		<Y>330</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[J_TimeVariables]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[new J_TimeVariables()]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1765189970306</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1765189991043</Id>
+		<Name><![CDATA[p_timeParameters]]></Name>
+		<X>-610</X>
+		<Y>310</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[J_TimeParameters]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[new J_TimeParameters()]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1765189991041</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1663238323139</Id>
 		<Name><![CDATA[c_connectionOwners]]></Name>
@@ -2322,7 +2378,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>List&lt;J_ChargingSession&gt;</ElementClass>
+			<ElementClass>List&lt;J_ChargingSessionData&gt;</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
diff --git a/_alp/Agents/GCPublicCharger/Code/Functions.java b/_alp/Agents/GCPublicCharger/Code/Functions.java
index 6a184da9..dc279fab 100644
--- a/_alp/Agents/GCPublicCharger/Code/Functions.java
+++ b/_alp/Agents/GCPublicCharger/Code/Functions.java
@@ -20,9 +20,6 @@ else if( e.profileType == OL_ProfileAssetType.ELECTRICITYBASELOAD){
 {/*ALCODESTART::1726749088568*/
 //Manage charging
 f_manageEVCharging();
-
-f_manageChargePoints();
-
 /*ALCODEEND*/}
 
 double f_operateChargerNew()
diff --git a/_alp/Agents/GCPublicCharger/Code/Functions.xml b/_alp/Agents/GCPublicCharger/Code/Functions.xml
index cf6c7e88..4bd60725 100644
--- a/_alp/Agents/GCPublicCharger/Code/Functions.xml
+++ b/_alp/Agents/GCPublicCharger/Code/Functions.xml
@@ -6,8 +6,8 @@
 		<Id>1717956478582</Id>
 		<Name><![CDATA[f_operateFixedAssets_overwrite]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>910</X>
-		<Y>200</Y>
+		<X>1250</X>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -23,7 +23,7 @@
 		<Id>1726749088568</Id>
 		<Name><![CDATA[f_operateFlexAssets_overwrite]]></Name>
 		<X>910</X>
-		<Y>220</Y>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 596e5b55..859d1c1b 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -134,8 +134,6 @@
 
 f_manageEVCharging();
 
-f_manageChargePoints();
-
 f_manageBattery();
 /*ALCODEEND*/}
 
@@ -158,25 +156,13 @@
 v_currentEnergyCurtailed_kW = 0;
 v_currentPrimaryEnergyProductionHeatpumps_kW = 0;
 v_batteryStoredEnergy_kWh = 0;
-// Categorical power flows
-/*v_fixedConsumptionElectric_kW = 0;
-v_electricHobConsumption_kW = 0;
-v_heatPumpElectricityConsumption_kW = 0;
-v_hydrogenElectricityConsumption_kW = 0;
-v_evChargingPowerElectric_kW = 0;
-v_batteryPowerElectric_kW = 0;
-v_windProductionElectric_kW = 0;
-v_pvProductionElectric_kW = 0;
-v_ptProductionHeat_kW = 0;
-v_conversionPowerElectric_kW = 0;
-v_CHPProductionElectric_kW = 0;
-v_districtHeatDelivery_kW = 0;*/
 
 if (v_enableNFato) {
 	f_nfatoUpdateConnectionCapacity();
 }
 
-c_tripTrackers.forEach(t -> t.manageActivities(energyModel.t_h-energyModel.p_runStartTime_h));
+c_tripTrackers.forEach(t -> t.manageActivities(energyModel.t_h-energyModel.p_runStartTime_h, p_chargePoint));
+c_chargingSessions.forEach(cs -> cs.manageCurrentChargingSession(energyModel.t_h, p_chargePoint));
 
 f_operateFixedAssets();
 f_operateFlexAssets();
@@ -184,10 +170,6 @@
 f_curtailment();
 
 f_connectionMetering();
-
-//if (!Double.isFinite(v_currentPowerElectricity_kW)) {
-//	traceln("Gridconnection %s with connection_id %s has NaN or infinite v_currentPowerElectricity_kW at time %s!", p_gridConnectionID, p_company_connection_id, energyModel.t_h);
-//}
 /*ALCODEEND*/}
 
 double f_operateFixedAssets()
@@ -218,207 +200,23 @@
 //Reset specific variables/collections in specific GC types (GCProduction, GConversion, etc.)
 f_resetSpecificGCStates();
 
+//Store states and reset charge point
+if(p_chargePoint != null){
+	p_chargePoint.storeStatesAndReset();
+}
 /*ALCODEEND*/}
 
 double f_manageEVCharging()
 {/*ALCODESTART::1671095995172*/
-if(c_electricVehicles.size() > 0){
+if(c_electricVehicles.size() + c_chargingSessions.size() > 0 ){
 	if (p_chargingManagement == null) {
-		//throw new RuntimeException("Tried to charge EV without algorithm in GC!: " + p_gridConnectionID);
-		traceln("Tried to charge EV without algorithm in GC!: %s" ,p_gridConnectionID);
-		
-	} else {
-		p_chargingManagement.manageCharging();
-	}
-}
-
-/*ALCODEEND*/}
-
-double f_simpleCharging()
-{/*ALCODESTART::1671095995175*/
-// Removing items while going through a loop, so we do so in reverse order
-
-ArrayList<J_EAEV> copiedVehicleList = new ArrayList<J_EAEV>(c_vehiclesAvailableForCharging);
-int countDeletedItems = 0;
-
-for ( int i = 0; i < copiedVehicleList.size(); i++ ) {
-	J_EAEV ev = copiedVehicleList.get(i);
-	if (ev.vehicleScaling != 0) {
-		if( !ev.getAvailability() || ev.getCurrentStateOfCharge_fr() == 1 ) {
-			ev.f_updateAllFlows( 0.0 );
-			c_vehiclesAvailableForCharging.remove( i - countDeletedItems );
-			countDeletedItems ++;
-		}
-		else {
-			ev.f_updateAllFlows( 1.0 );
-		}
-	}
-}
-/*ALCODEEND*/}
-
-double f_maxSpreadCharging()
-{/*ALCODESTART::1671095995177*/
-ArrayList<J_EAEV> copiedVehicleList = new ArrayList<J_EAEV>(c_vehiclesAvailableForCharging);
-int countDeletedItems = 0;
-
-for ( int i = 0; i < copiedVehicleList.size(); i++ ){
-	J_EAEV ev = copiedVehicleList.get(i);
-	if (ev.vehicleScaling != 0) {
-		if(!ev.getAvailability() || ev.getCurrentStateOfCharge_fr() == 1) {
-			ev.f_updateAllFlows( 0.0 );
-			c_vehiclesAvailableForCharging.remove( i - countDeletedItems );
-			countDeletedItems ++;
-		}
-		else {
-			double chargeNeedForNextTrip_kWh = max(0, ev.getEnergyNeedForNextTrip_kWh() - ev.getCurrentStateOfCharge_kWh());
-			double maxChargingPower_kW = ev.getCapacityElectric_kW();
-			double chargeDeadline_h = floor((ev.tripTracker.v_nextEventStartTime_min / 60 - chargeNeedForNextTrip_kWh / maxChargingPower_kW) / energyModel.p_timeStep_h) * energyModel.p_timeStep_h;
-			
-			double emptyKWhInBattery = ev.getStorageCapacity_kWh() - ev.getCurrentStateOfCharge_kWh();
-			double timeToNextTrip_h = ev.tripTracker.v_nextEventStartTime_min / 60 - energyModel.t_h;			
-			// At the end of the simulation the triptracker returns back to the start of the year, so we make sure the timeToNextTrip is not negative
-			timeToNextTrip_h = (timeToNextTrip_h % 8760 + 8760) % 8760;
-			
-			double chargingPower_kW;		
-			if ( energyModel.t_h >= chargeDeadline_h && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
-				//traceln("Urgency charging! May exceed connection capacity!");
-				chargingPower_kW = maxChargingPower_kW / 2 ;	// delen door 2 als quickfix doordat HAVI trucks anders mega pieken veroorzaken in de middag waardoor 'slim' laden beetje nutteloos lijkt
-			}
-			else {
-				chargingPower_kW = emptyKWhInBattery / timeToNextTrip_h;
-			}
-			
-			chargingPower_kW = min(chargingPower_kW, maxChargingPower_kW); // cap the charging speed at the electric capacity
-			double ratio_fr = chargingPower_kW / maxChargingPower_kW;
-			ev.f_updateAllFlows( ratio_fr );
-		}
-	}
-}
-/*ALCODEEND*/}
-
-double f_maxPowerCharging(double availableCapacityForCharging_kW)
-{/*ALCODESTART::1671095995179*/
-double remainingChargingPower_kW = availableCapacityForCharging_kW;
-
-ArrayList<J_EAEV> copiedVehicleList = new ArrayList<J_EAEV>(c_vehiclesAvailableForCharging);
-int countDeletedItems = 0;
-
-// Sort vehicles by time until charge deadline
-copiedVehicleList.sort((ev1, ev2) -> Double.compare(f_getChargeDeadline(ev1), f_getChargeDeadline(ev2)));
-c_vehiclesAvailableForCharging = copiedVehicleList;
-
-for ( int i = 0; i < copiedVehicleList.size(); i++ ){
-	J_EAEV ev = copiedVehicleList.get(i);
-	if (ev.vehicleScaling != 0) {
-		if( !ev.getAvailability() || ev.getCurrentStateOfCharge_fr() == 1 ) {
-			ev.f_updateAllFlows( 0.0 );
-			c_vehiclesAvailableForCharging.remove( i - countDeletedItems );
-			countDeletedItems ++;
-		}
-		else {
-			//traceln("current time: " + energyModel.t_h);
-			//traceln("ev: " + ev);
-			//traceln("dist: " + ev.getTripTracker().v_tripDist_km);
-			double chargeNeedForNextTrip_kWh = max(0, ev.getEnergyNeedForNextTrip_kWh() - ev.getCurrentStateOfCharge_kWh());
-			//traceln("chargeNeedForNextTrip_kWh: " + chargeNeedForNextTrip_kWh);
-			double maxChargingPower_kW = ev.getCapacityElectric_kW();
-			double chargeDeadline_h = floor((ev.tripTracker.v_nextEventStartTime_min / 60 - chargeNeedForNextTrip_kWh / maxChargingPower_kW) / energyModel.p_timeStep_h) * energyModel.p_timeStep_h;
-			
-			//double starttime = ev.tripTracker.v_nextEventStartTime_min / 60;
-			//traceln("starttime: " + starttime);
-			//traceln("chargeDeadline_h: " + chargeDeadline_h);
-			
-			double chargingPower_kW;
-			if ( energyModel.t_h >= chargeDeadline_h && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
-				//traceln("Urgency charging! May exceed connection capacity!");
-				chargingPower_kW = maxChargingPower_kW;	
-			}
-			else {
-				chargingPower_kW = remainingChargingPower_kW;
-			}
-			
-			chargingPower_kW = min(chargingPower_kW, maxChargingPower_kW);
-			remainingChargingPower_kW = max(0, remainingChargingPower_kW - chargingPower_kW);
-			double ratio_fr = chargingPower_kW / maxChargingPower_kW;
-			ev.f_updateAllFlows( ratio_fr );
-			//gridConnection.v_evChargingPowerElectric_kW += flowsArray[4] - flowsArray[0];
-			
-			//double x = flowsArray[4] - flowsArray[0];
-			//traceln("flow: " + x);
-			//traceln("ev: " + ev);
-			
-		}
-	}
-}
-/*ALCODEEND*/}
-
-double f_chargeOnPrice(double currentElectricityPriceConsumption_eurpkWh,double availableChargingPower_kW)
-{/*ALCODESTART::1671095995181*/
-ArrayList<J_EAEV> copiedVehicleList = new ArrayList<J_EAEV>(c_vehiclesAvailableForCharging);
-int countDeletedItems = 0;
-
-double remainingChargePower_kW = availableChargingPower_kW;
-
-for ( int i = 0; i < copiedVehicleList.size(); i++ ){
-	J_EAEV vehicle = copiedVehicleList.get(i);
-	
-	if (vehicle.getVehicleScaling() == 0) {
-		continue;
-	}
-	
-	if(!vehicle.getAvailability() ){
-		vehicle.f_updateAllFlows( 0 );
-		c_vehiclesAvailableForCharging.remove( i - countDeletedItems );
-		countDeletedItems ++;
+		throw new RuntimeException("Tried to charge EV without algorithm in GC!: " + p_gridConnectionID);
+		//traceln("Tried to charge EV without algorithm in GC!: %s" ,p_gridConnectionID);
 	} else {
-		//double availableChargingPower_kW = v_allowedCapacity_kW - v_currentPowerElectricity_kW - v_chargingPower_kW;
-		double chargeNeedForNextTrip_kWh = max(0, vehicle.energyNeedForNextTrip_kWh - vehicle.getCurrentStateOfCharge_kWh());
-		//double timeToNexTrip_min = vehicle.getMobilityTracker().v_nextTripStartTime_min - energyModel.t_h*60;
-		double maxChargingPower_kW = vehicle.getCapacityElectric_kW();
-		double timeToNextTrip_min = vehicle.tripTracker.v_nextEventStartTime_min - energyModel.t_h*60;
-		double chargeDeadline_min = floor((vehicle.tripTracker.v_nextEventStartTime_min / 60 - chargeNeedForNextTrip_kWh / maxChargingPower_kW) / energyModel.p_timeStep_h) * 60 * energyModel.p_timeStep_h;
-
-		double priceGain_kWhpeur = 1; // When WTP is higher than current electricity price, ramp up charging power with this gain based on the price-delta.
-		double urgencyGain_eurpkWh = 0.4; // How strongly WTP-price shifts based on charging flexibility
-		double maxSpreadChargingPower_kW = min(chargeNeedForNextTrip_kWh / (max(1, timeToNextTrip_min - v_additionalTimeSpreadCharging_MIN) / 60), maxChargingPower_kW);
-		//traceln("maxSpreadChargingPower_kW" + maxSpreadChargingPower_kW);
-		double WTPoffset_eurpkWh = 0.05*(1-energyModel.v_WindYieldForecast_fr);//0.15; // Adds an offset to the WTP price; this value is very much context specific, depending on market conditions during charging periods
-		
-		double chargeSetpoint_kW = 0;
-
-		if ( energyModel.t_h*60 >= chargeDeadline_min & chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
-			//traceln("Urgency charging! May exceed connection capacity!");
-			chargeSetpoint_kW = maxChargingPower_kW;				
-		} else if ( vehicle.getCurrentStateOfCharge_fr() < 0.15 ) {
-			chargeSetpoint_kW = min(remainingChargePower_kW, maxChargingPower_kW);
-		} else {
-			//double WTPprice_eurpkWh = v_electricityPriceLowPassed_eurpkWh - flexibilityGain_eurph * (chargeDeadline_min - energyModel.t_h*60 - 600);
-			v_WTPCharging_eurpkWh = WTPoffset_eurpkWh + v_electricityPriceLowPassed_eurpkWh + urgencyGain_eurpkWh * ( maxSpreadChargingPower_kW / maxChargingPower_kW ); // Scale WTP based on flexibility expressed in terms of power-fraction
-			//WTPprice_eurpkWh = WTPoffset_eurpkWh + (main.v_epexNext24hours_eurpkWh+v_electricityPriceLowPassed_eurpkWh)/2 + flexibilityGain_eurpkWh * sqrt(maxSpreadChargingPower_kW/maxChargingPower_kW); // Scale WTP based on flexibility expressed in terms of power-fraction
-			chargeSetpoint_kW = max(0, maxChargingPower_kW * (v_WTPCharging_eurpkWh / currentElectricityPriceConsumption_eurpkWh - 1) * priceGain_kWhpeur);
-			chargeSetpoint_kW = min(remainingChargePower_kW, chargeSetpoint_kW);
-			//traceln("Trying to charge cheaply, time " + energyModel.t_h*60 + " minutes, charge setpoint: " + chargeSetpoint_kW + " kW");
-			/*if (this.getIndex() == 0){
-				traceln("wtp = " + v_WTPCharging_eurpkWh);
-				traceln("remainingChargePower_kW: " + remainingChargePower_kW + "charge setpoint kW: " + chargeSetpoint_kW);
-			}*/
-		}
-		//}
-		//traceln("Hello! Charge setpoint: " + chargeSetpoint_kW);
-		//Pair<J_FlowsMap, Double> flowsPair = vehicle.f_updateAllFlows( chargeSetpoint_kW / maxChargingPower_kW );
-		vehicle.f_updateAllFlows( chargeSetpoint_kW / maxChargingPower_kW );
-		//v_evChargingPowerElectric_kW += flowsMap.get(OL_EnergyCarriers.ELECTRICITY);
-		
-		// This seems wrong? the evChargingPowerElectric is keeping track of the total, but is subtracted every time!!
-		//remainingChargePower_kW = availableChargingPower_kW - v_evChargingPowerElectric_kW 
-
-		remainingChargePower_kW = availableChargingPower_kW - vehicle.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);;
-		
+		p_chargingManagement.manageCharging(p_chargePoint);
 	}
-	
 }
 
-
 /*ALCODEEND*/}
 
 double f_setOperatingSwitches()
@@ -451,6 +249,9 @@
 		if(p_chargingManagement == null){
 			f_addChargingManagement(OL_ChargingAttitude.SIMPLE);
 		}
+		if(p_chargePoint == null){
+			p_chargePoint = new J_ChargePoint(true, true);
+		}
 		c_electricVehicles.add(ev);
 		energyModel.c_EVs.add(ev);	
 		ev.setV2GActive(p_chargingManagement.getV2GActive());
@@ -460,10 +261,10 @@
 	if (tripTracker == null) { // Only provide tripTracker when vehicle doesn't have it yet!
 		if (vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK) {
 			int rowIndex = uniform_discr(1, 7);//getIndex() % 200;	
-			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, vehicle);
+			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, vehicle, p_chargePoint);
 		} else if (vehicle.energyAssetType == OL_EnergyAssetType.DIESEL_VAN || vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN) {// No mobility pattern for business vans available yet!! Falling back to truck mobility pattern
 			int rowIndex = uniform_discr(1, 7);//getIndex() % 200;	
-			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, vehicle);
+			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, vehicle, p_chargePoint);
 			tripTracker.setAnnualDistance_km(30_000);
 		} else {
 			//traceln("Adding passenger vehicle to gridconnection %s", this);
@@ -471,7 +272,7 @@
 			while (rowIndex == 28 || rowIndex == 42 || rowIndex == 150) { // 445, 457, 483, 540, 563 all impossible triptrackers for vehicles with 116 kWh and 0.16 kWhpkm
 				rowIndex = uniform_discr(0, 200);
 			}
-			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_householdTripsCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, vehicle);
+			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_householdTripsCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, vehicle, p_chargePoint);
 			//tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_householdTripsExcel, 18, energyModel.t_h*60, vehicle);
 			//int rowIndex = uniform_discr(1, 7);//getIndex() % 200;	
 			//tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsExcel, 2, energyModel.t_h*60, vehicle);
@@ -479,6 +280,9 @@
 		
 		vehicle.tripTracker = tripTracker;	
 	}
+	else if( vehicle.getAvailability() && vehicle instanceof J_EAEV ev){
+		tripTracker.prepareNextActivity((energyModel.t_h-energyModel.p_runStartTime_h)*60, p_chargePoint);
+	}
 	c_tripTrackers.add( tripTracker );
 	//v_vehicleIndex ++;
 } else if (j_ea instanceof J_EAConsumption consumptionAsset) {
@@ -556,11 +360,15 @@ else if (productionAsset.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 	c_profileAssets.add(profileAsset);
 } else if (j_ea instanceof J_EADieselTractor tractor) {
 	c_profileAssets.add(tractor);
-} else if (j_ea instanceof J_EAChargePoint charger) {
+} else if (j_ea instanceof J_EAChargingSession chargingSession) {
 	if(p_chargingManagement == null){
 		f_addChargingManagement(OL_ChargingAttitude.SIMPLE);
 	}
-	c_chargers.add(charger);
+	if(p_chargePoint == null){
+		p_chargePoint = new J_ChargePoint(true, true);
+	}
+	c_chargingSessions.add(chargingSession);
+	chargingSession.setV2GActive(p_chargingManagement.getV2GActive());
 } else {
 	if (!(this instanceof GCHouse && j_ea instanceof J_EAAirco)) {
 		traceln("Unrecognized energy asset %s in gridconnection %s", j_ea, this);
@@ -575,82 +383,6 @@ else if (productionAsset.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 // Abstract method to be used call GC-subtype specific functions
 /*ALCODEEND*/}
 
-double f_chargeOnPrice_V2G(double currentElectricityPriceConsumption_eurpkWh,double availableChargingPower_kW)
-{/*ALCODESTART::1695822607494*/
-ArrayList<J_EAEV> copiedVehicleList = new ArrayList<J_EAEV>(c_vehiclesAvailableForCharging);
-int countDeletedItems = 0;
-
-double remainingChargePower_kW = availableChargingPower_kW;
-
-for ( int i = 0; i < copiedVehicleList.size(); i++ ){
-	J_EAEV vehicle = copiedVehicleList.get(i);
-	
-	if (vehicle.getVehicleScaling() == 0) {
-		continue;
-	}
-	
-	if(!vehicle.getAvailability() ){
-		vehicle.f_updateAllFlows( 0 );
-		c_vehiclesAvailableForCharging.remove( i - countDeletedItems );
-		countDeletedItems ++;
-	} else {
-		//double availableChargingPower_kW = v_allowedCapacity_kW - v_currentPowerElectricity_kW - v_chargingPower_kW;
-		double chargeNeedForNextTrip_kWh = vehicle.energyNeedForNextTrip_kWh - vehicle.getCurrentStateOfCharge_kWh();
-		//double timeToNexTrip_min = vehicle.getMobilityTracker().v_nextTripStartTime_min - energyModel.t_h*60;
-		double maxChargingPower_kW = vehicle.getCapacityElectric_kW();
-		double timeToNextTrip_min = vehicle.tripTracker.v_nextEventStartTime_min - energyModel.t_h*60;
-		double chargeDeadline_min = floor((vehicle.tripTracker.v_nextEventStartTime_min / 60 - chargeNeedForNextTrip_kWh / maxChargingPower_kW) / energyModel.p_timeStep_h) * 60 * energyModel.p_timeStep_h;
-
-		double priceGain_kWhpeur = 1; // When WTP is higher than current electricity price, ramp up charging power with this gain based on the price-delta.
-		double urgencyGain_eurpkWh = 0.4; // How strongly WTP-price shifts based on charging flexibility
-		double maxSpreadChargingPower_kW = min(chargeNeedForNextTrip_kWh / (max(1, timeToNextTrip_min - v_additionalTimeSpreadCharging_MIN) / 60), maxChargingPower_kW);
-		//traceln("maxSpreadChargingPower_kW" + maxSpreadChargingPower_kW);
-		double WTPoffset_eurpkWh = 0;
-		if (energyModel.v_liveAssetsMetaData.totalInstalledWindPower_kW > 499) {
-			WTPoffset_eurpkWh = 0.05*(1-energyModel.v_WindYieldForecast_fr);//0.15; // Adds an offset to the WTP price; this value is very much context specific, depending on market conditions during charging periods
-		} else {
-			WTPoffset_eurpkWh = 0.02;
-		}
-		double V2G_WTR_offset_eurpkWh = 0.05;
-		double chargeSetpoint_kW = 0;
-
-		if ( energyModel.t_h*60 >= chargeDeadline_min - 15 && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
-			//traceln("Urgency charging! May exceed connection capacity!");
-			chargeSetpoint_kW = maxChargingPower_kW;				
-		} else if ( vehicle.getCurrentStateOfCharge_fr() < 0.15 ) {
-			chargeSetpoint_kW = min(remainingChargePower_kW, maxChargingPower_kW);
-		} else {
-			//double WTPprice_eurpkWh = v_electricityPriceLowPassed_eurpkWh - flexibilityGain_eurph * (chargeDeadline_min - energyModel.t_h*60 - 600);
-			v_WTPCharging_eurpkWh = WTPoffset_eurpkWh + v_electricityPriceLowPassed_eurpkWh + urgencyGain_eurpkWh * ( max(0,maxSpreadChargingPower_kW) / maxChargingPower_kW ); // Scale WTP based on flexibility expressed in terms of power-fraction
-			//WTPprice_eurpkWh = WTPoffset_eurpkWh + (main.v_epexNext24hours_eurpkWh+v_electricityPriceLowPassed_eurpkWh)/2 + flexibilityGain_eurpkWh * sqrt(maxSpreadChargingPower_kW/maxChargingPower_kW); // Scale WTP based on flexibility expressed in terms of power-fraction
-			chargeSetpoint_kW = max(0, maxChargingPower_kW * (v_WTPCharging_eurpkWh / currentElectricityPriceConsumption_eurpkWh - 1) * priceGain_kWhpeur);
-			chargeSetpoint_kW = min(remainingChargePower_kW, chargeSetpoint_kW);
-			
-			if ( chargeNeedForNextTrip_kWh < -maxChargingPower_kW*energyModel.p_timeStep_h && chargeSetpoint_kW == 0 ) { // Surpluss SOC and high energy price			
-				v_WTRV2G_eurpkWh  = V2G_WTR_offset_eurpkWh + v_electricityPriceLowPassed_eurpkWh; // Scale WTP based on flexibility expressed in terms of power-fraction
-				chargeSetpoint_kW = min(0, -maxChargingPower_kW * (currentElectricityPriceConsumption_eurpkWh / v_WTRV2G_eurpkWh - 1) * priceGain_kWhpeur);
-				/*if (chargeSetpoint_kW < 0) {
-					traceln(" V2G Active! Power: " + chargeSetpoint_kW );
-				}*/
-				
-			}
-			//traceln("Trying to charge cheaply, time " + energyModel.t_h*60 + " minutes, charge setpoint: " + chargeSetpoint_kW + " kW");
-			/*if (this.getIndex() == 0){
-				traceln("wtp = " + v_WTPCharging_eurpkWh);
-				traceln("remainingChargePower_kW: " + remainingChargePower_kW + "charge setpoint kW: " + chargeSetpoint_kW);
-			}*/
-		}
-
-		vehicle.f_updateAllFlows( chargeSetpoint_kW / maxChargingPower_kW );
-
-		remainingChargePower_kW = availableChargingPower_kW - vehicle.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);
-		
-	}
-}
-
-
-/*ALCODEEND*/}
-
 double f_initialize()
 {/*ALCODESTART::1698854861644*/
 if (v_liveConnectionMetaData.physicalCapacity_kW < 0) {
@@ -772,22 +504,24 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 c_energyAssets.remove(j_ea);
 energyModel.c_energyAssets.remove(j_ea);
 
-if (j_ea instanceof J_EAVehicle) {
-	J_EAVehicle vehicle = (J_EAVehicle)j_ea;
+if (j_ea instanceof J_EAVehicle vehicle) {
 	if (vehicle instanceof J_EADieselVehicle) {
-		c_dieselVehicles.remove( (J_EADieselVehicle)vehicle );		
+		c_dieselVehicles.remove(vehicle);		
 	} else if (vehicle instanceof J_EAHydrogenVehicle) {
-		c_hydrogenVehicles.remove((J_EAHydrogenVehicle)vehicle);		
-	} else if (vehicle instanceof J_EAEV) {
-		c_electricVehicles.remove(j_ea);
-		energyModel.c_EVs.remove((J_EAEV)vehicle);
+		c_hydrogenVehicles.remove(vehicle);		
+	} else if (vehicle instanceof J_EAEV ev) {
+		c_electricVehicles.remove(ev);
+		energyModel.c_EVs.remove(ev);
+		if(p_chargePoint.isRegistered(ev)){
+			p_chargePoint.deregisterChargingRequest(ev);
+		}
 	}
-	c_vehicleAssets.remove(j_ea);
+	c_vehicleAssets.remove(vehicle);
 		
 	J_ActivityTrackerTrips tripTracker = vehicle.tripTracker;
 	c_tripTrackers.remove( tripTracker );
 	vehicle.tripTracker = null;
-	//v_vehicleIndex --;
+
 } else if (j_ea instanceof J_EAConsumption) {
 	c_consumptionAssets.remove((J_EAConsumption)j_ea);	
 	if (j_ea.energyAssetType == OL_EnergyAssetType.HOT_WATER_CONSUMPTION) {
@@ -799,12 +533,9 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 	}
 } else if (j_ea instanceof J_EAProduction) {
 	c_productionAssets.remove((J_EAProduction)j_ea);
-	//energyModel.c_productionAssets.remove((J_EAProduction)j_ea);
+
 	if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
 		J_EAProduction otherPV = findFirst(c_productionAssets, x -> x.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC);
-		if (otherPV == null) {
-			//v_liveAssetsMetaData.hasPV = false;
-		}
 		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
 		v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW;
 		if ( p_parentNodeElectric != null ) {
@@ -871,8 +602,8 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 	}
 } else if  (j_ea instanceof J_EAProfile) {
 	c_profileAssets.remove((J_EAProfile)j_ea);
-} else if (j_ea instanceof J_EAChargePoint) {
-	c_chargers.remove(j_ea);
+} else if (j_ea instanceof J_EAChargingSession) {
+	c_chargingSessions.remove(j_ea);
 } else {
 	traceln("Unrecognized energy asset %s in gridconnection %s", j_ea, this);
 }
@@ -889,8 +620,10 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 //Reset specificGC states after rapid run
 f_resetSpecificGCStatesAfterRapidRun();
 
-
-
+//Restore states in charge point
+if(p_chargePoint != null){
+	p_chargePoint.restoreStates();
+}
 
 
 /*ALCODEEND*/}
@@ -1167,7 +900,7 @@ else if (flowsMap.get(EC) > 0){
 	}
 	
 	//Fast forward time dependent energy assets (if present)
-	c_chargers.forEach(charger -> charger.fastForwardCharingSessions(energyModel.t_h));
+	c_chargingSessions.forEach(cs -> cs.fastForwardCharingSessions(energyModel.t_h, p_chargePoint));
 		
 	//Initialize/reset dataset maps to 0
 	double startTime = energyModel.v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
@@ -1176,15 +909,6 @@ else if (flowsMap.get(EC) > 0){
 }
 /*ALCODEEND*/}
 
-double f_getChargeDeadline(J_EAEV ev)
-{/*ALCODESTART::1725455130676*/
-double chargeNeedForNextTrip_kWh = max(0, ev.getEnergyNeedForNextTrip_kWh() - ev.getCurrentStateOfCharge_kWh());
-double maxChargingPower_kW = ev.getCapacityElectric_kW();
-
-return floor((ev.tripTracker.v_nextEventStartTime_min / 60 - chargeNeedForNextTrip_kWh / maxChargingPower_kW) / energyModel.p_timeStep_h) * energyModel.p_timeStep_h;
-
-/*ALCODEEND*/}
-
 double f_initializeDataSets()
 {/*ALCODESTART::1730728785333*/
 v_liveData.dsm_liveDemand_kW.createEmptyDataSets(v_liveData.activeConsumptionEnergyCarriers, (int)(168 / energyModel.p_timeStep_h));
@@ -1193,12 +917,6 @@ else if (flowsMap.get(EC) > 0){
 
 /*ALCODEEND*/}
 
-double f_manageChargePoints()
-{/*ALCODESTART::1750258434630*/
-c_chargers.forEach( x -> x.f_updateAllFlows(energyModel.t_h) );
-
-/*ALCODEEND*/}
-
 double f_manageHeating()
 {/*ALCODESTART::1753099764237*/
 if (p_heatingManagement != null) {
@@ -1382,7 +1100,6 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
 {/*ALCODESTART::1754582754934*/
 if(energyModel.b_isInitialized){
 	p_chargingManagement.setV2GActive(enableV2G);
-	c_chargers.forEach(charger -> charger.setV2GActive(enableV2G));
 	if (enableV2G){
 		f_addAssetFlow(OL_AssetFlowCategories.V2GPower_kW);
 	}
@@ -1418,7 +1135,7 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
 		managementClass = J_ChargingManagementLocalBalancing.class;
 		break;
 	case BALANCE_GRID:
-		managementClass = J_ChargingManagementLocalBalancing.class;
+		managementClass = J_ChargingManagementGridBalancing.class;
 		break;
 	case MAX_POWER:
 		managementClass = J_ChargingManagementMaxAvailablePower.class;
@@ -1437,16 +1154,6 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
 
 p_chargingManagement = chargingManagement;
 
-//TEMPORARY UNTIL CHARGEPOINT MANAGEMENT AND EV CHARGING MANAGEMENT ARE COMBINED
-if (c_chargers.size()>0){
-	if (chargingType == null) {
-			throw new RuntimeException("Charging strategy needed when chargers are present!");
-	}
-	else{
-		c_chargers.forEach(charger -> charger.setChargingAttitude(chargingType));
-	}
-}
-
 //Add new asset management to energyModel
 if(this.p_chargingManagement != null){
 	energyModel.f_registerAssetManagement(this.p_chargingManagement);
@@ -1582,3 +1289,13 @@ I_HeatingManagement f_getHeatingManagement()
 return p_heatingManagement;
 /*ALCODEEND*/}
 
+J_ChargePoint f_getChargePoint()
+{/*ALCODESTART::1765551413839*/
+return p_chargePoint;
+/*ALCODEEND*/}
+
+J_ChargePoint f_setChargePoint(J_ChargePoint chargePoint)
+{/*ALCODESTART::1765551488579*/
+this.p_chargePoint = chargePoint;
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml
index 36ddc0cd..eca141dd 100644
--- a/_alp/Agents/GridConnection/Code/Functions.xml
+++ b/_alp/Agents/GridConnection/Code/Functions.xml
@@ -112,88 +112,6 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1671095995175</Id>
-		<Name><![CDATA[f_simpleCharging]]></Name>
-		<Description><![CDATA[Charging when arriving home, not taking grid limits into account]]></Description>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1960</X>
-		<Y>320</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1671095995177</Id>
-		<Name><![CDATA[f_maxSpreadCharging]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1970</X>
-		<Y>360</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1671095995179</Id>
-		<Name><![CDATA[f_maxPowerCharging]]></Name>
-		<Description><![CDATA[Charge at max power taking grid constaints into account]]></Description>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1970</X>
-		<Y>380</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Parameter>
-			<Name><![CDATA[availableCapacityForCharging_kW]]></Name>
-			<Type><![CDATA[double]]></Type>
-		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1671095995181</Id>
-		<Name><![CDATA[f_chargeOnPrice]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1970</X>
-		<Y>420</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Parameter>
-			<Name><![CDATA[currentElectricityPriceConsumption_eurpkWh]]></Name>
-			<Type><![CDATA[double]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[availableChargingPower_kW]]></Name>
-			<Type><![CDATA[double]]></Type>
-		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="default" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -250,31 +168,6 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1695822607494</Id>
-		<Name><![CDATA[f_chargeOnPrice_V2G]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1970</X>
-		<Y>440</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Parameter>
-			<Name><![CDATA[currentElectricityPriceConsumption_eurpkWh]]></Name>
-			<Type><![CDATA[double]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[availableChargingPower_kW]]></Name>
-			<Type><![CDATA[double]]></Type>
-		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="default" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -549,27 +442,6 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1725455130676</Id>
-		<Name><![CDATA[f_getChargeDeadline]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1990</X>
-		<Y>400</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Parameter>
-			<Name><![CDATA[ev]]></Name>
-			<Type><![CDATA[J_EAEV]]></Type>
-		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="default" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -586,22 +458,6 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1750258434630</Id>
-		<Name><![CDATA[f_manageChargePoints]]></Name>
-		<X>920</X>
-		<Y>390</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="default" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -795,7 +651,7 @@
 		<Name><![CDATA[f_addChargingManagement]]></Name>
 		<Description><![CDATA[This function takes heatingType as an argument and adds the default heating management class to the GridConnection]]></Description>
 		<X>650</X>
-		<Y>500</Y>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -835,7 +691,7 @@
 		<Id>1762851936576</Id>
 		<Name><![CDATA[f_setChargingManagement]]></Name>
 		<X>650</X>
-		<Y>480</Y>
+		<Y>500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -891,7 +747,7 @@
 		<Id>1762853347370</Id>
 		<Name><![CDATA[f_getCurrentChargingType]]></Name>
 		<X>650</X>
-		<Y>520</Y>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -907,7 +763,7 @@
 		<Id>1762853561122</Id>
 		<Name><![CDATA[f_getV2GActive]]></Name>
 		<X>650</X>
-		<Y>540</Y>
+		<Y>560</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -923,7 +779,7 @@
 		<Id>1762853894937</Id>
 		<Name><![CDATA[f_getBatteryManagement]]></Name>
 		<X>650</X>
-		<Y>750</Y>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -959,7 +815,7 @@
 		<Id>1762855733010</Id>
 		<Name><![CDATA[f_setBatteryManagement]]></Name>
 		<X>650</X>
-		<Y>730</Y>
+		<Y>830</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -979,7 +835,7 @@
 		<Id>1762940915048</Id>
 		<Name><![CDATA[f_getChargingManagement]]></Name>
 		<X>650</X>
-		<Y>560</Y>
+		<Y>580</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1005,4 +861,40 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>J_ChargePoint</ReturnType>
+		<Id>1765551413839</Id>
+		<Name><![CDATA[f_getChargePoint]]></Name>
+		<X>660</X>
+		<Y>640</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>J_ChargePoint</ReturnType>
+		<Id>1765551488579</Id>
+		<Name><![CDATA[f_setChargePoint]]></Name>
+		<X>660</X>
+		<Y>620</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[chargePoint]]></Name>
+			<Type><![CDATA[J_ChargePoint]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 1fd7c9cb..ed8cbd29 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -22,89 +22,6 @@
 			</InitialValue>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1674329641809</Id>
-		<Name><![CDATA[v_currentElectricityPriceConsumption_eurpkWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2300</X>
-		<Y>380</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1674396166866</Id>
-		<Name><![CDATA[v_WTPCharging_eurpkWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2300</X>
-		<Y>400</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1678710234324</Id>
-		<Name><![CDATA[v_lowPassFactorLoad_fr]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2300</X>
-		<Y>440</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[0.1]]></Code>
-			</InitialValue>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1695824940090</Id>
-		<Name><![CDATA[v_WTRV2G_eurpkWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2300</X>
-		<Y>420</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1701700372072</Id>
 		<Name><![CDATA[v_currentEnergyCurtailed_kW]]></Name>
@@ -570,7 +487,7 @@
 		<Name><![CDATA[p_batteryManagement]]></Name>
 		<Description><![CDATA[Is variable to be able to make it private, but functions as a parameter -> doesnt change during rapid run.]]></Description>
 		<X>640</X>
-		<Y>710</Y>
+		<Y>810</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -590,7 +507,7 @@
 		<Name><![CDATA[p_chargingManagement]]></Name>
 		<Description><![CDATA[Is variable to be able to make it private, but functions as a parameter -> doesnt change during rapid run.]]></Description>
 		<X>640</X>
-		<Y>460</Y>
+		<Y>480</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -663,6 +580,25 @@
 			<Type><![CDATA[J_FlowsMap]]></Type>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1765551371538</Id>
+		<Name><![CDATA[p_chargePoint]]></Name>
+		<X>640</X>
+		<Y>600</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true"
+              Constant="false"
+              AccessType="private"
+              StaticVariable="false">
+			<Type><![CDATA[J_ChargePoint]]></Type>
+		</Properties>
+	</Variable>
 	<Variable Class="Parameter">
 		<Id>1658500465208</Id>
 		<Name><![CDATA[p_parentNodeElectricID]]></Name>
@@ -795,7 +731,7 @@
 		<Id>1668695364192</Id>
 		<Name><![CDATA[p_batteryAsset]]></Name>
 		<X>620</X>
-		<Y>690</Y>
+		<Y>790</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -848,7 +784,7 @@
 		<Id>1676449763319</Id>
 		<Name><![CDATA[p_heatBuffer]]></Name>
 		<X>620</X>
-		<Y>670</Y>
+		<Y>770</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -873,7 +809,7 @@
 		<Id>1684919785784</Id>
 		<Name><![CDATA[p_gasBuffer]]></Name>
 		<X>620</X>
-		<Y>770</Y>
+		<Y>870</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1352,7 +1288,7 @@
 		<Id>1659962626907</Id>
 		<Name><![CDATA[c_storageAssets]]></Name>
 		<X>600</X>
-		<Y>650</Y>
+		<Y>750</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1424,7 +1360,7 @@
 		<Id>1667746389220</Id>
 		<Name><![CDATA[c_vehicleAssets]]></Name>
 		<X>600</X>
-		<Y>400</Y>
+		<Y>420</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1442,7 +1378,7 @@
 		<Id>1669115948280</Id>
 		<Name><![CDATA[c_dieselVehicles]]></Name>
 		<X>620</X>
-		<Y>580</Y>
+		<Y>670</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1460,7 +1396,7 @@
 		<Id>1692864624612</Id>
 		<Name><![CDATA[c_tripTrackers]]></Name>
 		<X>620</X>
-		<Y>420</Y>
+		<Y>440</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1514,7 +1450,7 @@
 		<Id>1711012701187</Id>
 		<Name><![CDATA[c_hydrogenVehicles]]></Name>
 		<X>620</X>
-		<Y>600</Y>
+		<Y>690</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1548,9 +1484,9 @@
 	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1750258408126</Id>
-		<Name><![CDATA[c_chargers]]></Name>
+		<Name><![CDATA[c_chargingSessions]]></Name>
 		<X>600</X>
-		<Y>626</Y>
+		<Y>400</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1560,7 +1496,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>J_EAChargePoint</ElementClass>
+			<ElementClass>J_EAChargingSession</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
@@ -1587,7 +1523,7 @@
 		<Id>1754581015887</Id>
 		<Name><![CDATA[c_electricVehicles]]></Name>
 		<X>620</X>
-		<Y>440</Y>
+		<Y>460</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GridNode/Code/Functions.java b/_alp/Agents/GridNode/Code/Functions.java
index 7ca6da18..559d3df1 100644
--- a/_alp/Agents/GridNode/Code/Functions.java
+++ b/_alp/Agents/GridNode/Code/Functions.java
@@ -559,23 +559,36 @@ DataSet f_getPeakExportWeekDataSet()
 
 double f_getCurrentChargingInformation()
 {/*ALCODESTART::1758209089894*/
-v_currentChargingPower_kW = 0;
-v_currentNumberOfChargingChargePoints = 0;
+v_currentChargingPowerBalancingThisGN_kW = 0;
+v_currentNumberOfChargeRequestsBalancingThisGN = 0;
 
 for(GridConnection GC : c_connectedGridConnections){
-	if(GC instanceof GCPublicCharger){
-		for(J_EAChargePoint charger : GC.c_chargers){
-			v_currentChargingPower_kW += charger.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);
-			v_currentNumberOfChargingChargePoints += charger.getCurrentNumberOfChargingSockets();
+	if(GC.f_getChargingManagement() instanceof J_ChargingManagementGridBalancing){
+		for(J_EAEV ev : GC.c_electricVehicles){
+			v_currentChargingPowerBalancingThisGN_kW += ev.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);
 		}
+		for(J_EAChargingSession cs : GC.c_chargingSessions){
+			v_currentChargingPowerBalancingThisGN_kW += cs.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);
+		}
+		v_currentNumberOfChargeRequestsBalancingThisGN += GC.f_getChargePoint().getCurrentNumberOfChargeRequests();
 	}
 }
 
 // Low pass filter
 double filterTimeScale_h = 5*24;
 double filterDiffGain_r = 1/(filterTimeScale_h/energyModel.p_timeStep_h);
-v_lowPassedLoadFilter_kW += (v_currentLoad_kW - v_currentChargingPower_kW - v_lowPassedLoadFilter_kW) * filterDiffGain_r;	
+v_lowPassedLoadFilter_kW += (v_currentLoad_kW - v_currentChargingPowerBalancingThisGN_kW - v_lowPassedLoadFilter_kW) * filterDiffGain_r;	
 //v_lowPassedLoadFilter_kW += (v_currentLoad_kW - v_lowPassedLoadFilter_kW) * filterDiffGain_r;	
 
 /*ALCODEEND*/}
 
+int f_getCurrentNumberOfChargeRequestsBalancingThisGN()
+{/*ALCODESTART::1765548180792*/
+return v_currentNumberOfChargeRequestsBalancingThisGN;
+/*ALCODEEND*/}
+
+double f_getCurrentChargingPowerBalancingThisGN_kW()
+{/*ALCODESTART::1765548222744*/
+return v_currentChargingPowerBalancingThisGN_kW;
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GridNode/Code/Functions.xml b/_alp/Agents/GridNode/Code/Functions.xml
index e3a212fa..ff5f2ead 100644
--- a/_alp/Agents/GridNode/Code/Functions.xml
+++ b/_alp/Agents/GridNode/Code/Functions.xml
@@ -417,4 +417,36 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>int</ReturnType>
+		<Id>1765548180792</Id>
+		<Name><![CDATA[f_getCurrentNumberOfChargeRequestsBalancingThisGN]]></Name>
+		<X>830</X>
+		<Y>690</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1765548222744</Id>
+		<Name><![CDATA[f_getCurrentChargingPowerBalancingThisGN_kW]]></Name>
+		<X>830</X>
+		<Y>650</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/GridNode/Variables.xml b/_alp/Agents/GridNode/Variables.xml
index 28b8c6c3..d9e0a637 100644
--- a/_alp/Agents/GridNode/Variables.xml
+++ b/_alp/Agents/GridNode/Variables.xml
@@ -1196,7 +1196,7 @@ geupdate vanuit
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1758209121923</Id>
-		<Name><![CDATA[v_currentChargingPower_kW]]></Name>
+		<Name><![CDATA[v_currentChargingPowerBalancingThisGN_kW]]></Name>
 		<X>810</X>
 		<Y>630</Y>
 		<Label>
@@ -1208,7 +1208,7 @@ geupdate vanuit
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true"
               Constant="false"
-              AccessType="public"
+              AccessType="private"
               StaticVariable="false">
 			<Type><![CDATA[double]]></Type>
 			<InitialValue Class="CodeValue">
@@ -1218,9 +1218,9 @@ geupdate vanuit
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1758209124347</Id>
-		<Name><![CDATA[v_currentNumberOfChargingChargePoints]]></Name>
+		<Name><![CDATA[v_currentNumberOfChargeRequestsBalancingThisGN]]></Name>
 		<X>810</X>
-		<Y>650</Y>
+		<Y>670</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1230,7 +1230,7 @@ geupdate vanuit
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true"
               Constant="false"
-              AccessType="public"
+              AccessType="private"
               StaticVariable="false">
 			<Type><![CDATA[int]]></Type>
 			<InitialValue Class="CodeValue">
@@ -1243,7 +1243,7 @@ geupdate vanuit
 		<Name><![CDATA[v_nextNumberOfChargingChargePoints]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>810</X>
-		<Y>670</Y>
+		<Y>720</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1262,7 +1262,7 @@ geupdate vanuit
 		<Id>1758536215526</Id>
 		<Name><![CDATA[v_lowPassedLoadFilter_kW]]></Name>
 		<X>810</X>
-		<Y>700</Y>
+		<Y>750</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Classes/Class.I_ChargePointRegistration.java b/_alp/Classes/Class.I_ChargePointRegistration.java
new file mode 100644
index 00000000..89fa6bea
--- /dev/null
+++ b/_alp/Classes/Class.I_ChargePointRegistration.java
@@ -0,0 +1,6 @@
+public interface I_ChargePointRegistration
+{
+	public void registerChargingRequest(I_ChargingRequest chargingRequest);
+	public void deregisterChargingRequest(I_ChargingRequest chargingRequest);
+	public boolean isRegistered(I_ChargingRequest chargingRequest);
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.I_ChargingManagement.java b/_alp/Classes/Class.I_ChargingManagement.java
index 4d886b79..ac730e2c 100644
--- a/_alp/Classes/Class.I_ChargingManagement.java
+++ b/_alp/Classes/Class.I_ChargingManagement.java
@@ -13,12 +13,12 @@
 
 public interface I_ChargingManagement extends I_AssetManagement
 {
-	void manageCharging();
+	void manageCharging(J_ChargePoint chargePoint);
 	
-	OL_ChargingAttitude getCurrentChargingType();
+	public OL_ChargingAttitude getCurrentChargingType();
 	
-	void setV2GActive(boolean activateV2G);
-	boolean getV2GActive();
+	public void setV2GActive(boolean activateV2G);
+	public boolean getV2GActive();
 }
 
 
diff --git a/_alp/Classes/Class.I_ChargingRequest.java b/_alp/Classes/Class.I_ChargingRequest.java
new file mode 100644
index 00000000..9228a7d5
--- /dev/null
+++ b/_alp/Classes/Class.I_ChargingRequest.java
@@ -0,0 +1,30 @@
+/**
+ * I_ChargingRequest
+ */	
+public interface I_ChargingRequest {
+	
+	// The maximal capacity for the vehicle
+	public double getVehicleChargingCapacity_kW();
+	
+	public double getCurrentSOC_kWh();
+	
+	public double getStorageCapacity_kWh();
+	
+	public double getLeaveTime_h();
+	
+	public boolean getV2GCapable();
+	
+	// The total energy needed before the leave time
+	public double getEnergyNeedForNextTrip_kWh();
+	
+	// The remaining energy needed before the leave time
+	public double getRemainingChargeDemand_kWh();
+	
+	// The remaining average charging needed before the leave time
+	public double getRemainingAverageChargingDemand_kW(double t_h);
+	
+	public double getVehicleScaling_fr();
+	
+	// Sends the power into the EV/ChargingSession to update the SOC, ChargeDeadline etc...
+    public void f_updateAllFlows(double powerFraction_fr);
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ActivityTrackerTrips.java b/_alp/Classes/Class.J_ActivityTrackerTrips.java
index b92216f8..5eba9934 100644
--- a/_alp/Classes/Class.J_ActivityTrackerTrips.java
+++ b/_alp/Classes/Class.J_ActivityTrackerTrips.java
@@ -11,8 +11,10 @@ public class J_ActivityTrackerTrips extends J_ActivityTracker implements Seriali
 	private int rowIndex;
 	public J_EAVehicle Vehicle;
 	public double v_idleTimeToNextTrip_min;
+	public double v_idleTimeToNextTripStored_min;
 	public double v_tripDist_km;
 	public double v_energyNeedForNextTrip_kWh;
+	public double v_energyNeedForNextTripStored_kWh;
 	public double v_nextEventStartTime_min;
 	public double distanceScaling_fr = 1.0;
 	public double currentTripTimesteps_n;
@@ -24,7 +26,7 @@ public class J_ActivityTrackerTrips extends J_ActivityTracker implements Seriali
     public J_ActivityTrackerTrips() {
     }
     
-    public J_ActivityTrackerTrips(EnergyModel main, TextFile tripsCsv, int rowIndex, double time_min, J_EAVehicle Vehicle) {
+    public J_ActivityTrackerTrips(EnergyModel main, TextFile tripsCsv, int rowIndex, double time_min, J_EAVehicle Vehicle, I_ChargePointRegistration chargePointRegistration) {
     	this.energyModel = main;
     	this.rowIndex = rowIndex;
     	this.Vehicle = Vehicle;		
@@ -70,7 +72,7 @@ public J_ActivityTrackerTrips(EnergyModel main, TextFile tripsCsv, int rowIndex,
 	    		break;
 	    	}
 	    }
-	    prepareNextActivity(time_min);    	
+	    prepareNextActivity(time_min, chargePointRegistration);    	
     }
    
    public void setVehicle(J_EAVehicle Vehicle) {
@@ -109,22 +111,25 @@ public void setAnnualDistance_km(double desiredAnnualDistance_km) { // Scale tri
 	   //traceln("Desired annual distance was: %s km", desiredAnnualDistance_km);
    }
     
-   public void manageActivities(double t_h) {
+   public void manageActivities(double t_h, I_ChargePointRegistration chargePointRegistration) {
 		double time_min = t_h * 60;
     	if (Vehicle.getAvailability()) { // at start of timestep! check for multiple 'events' in timestep!
     		//if (time_min == roundToInt(starttimes_min.get(v_eventIndex) / (60*energyModel.p_timeStep_h)) * (energyModel.p_timeStep_h * 60) ) { // is a trip starting this timestep?
         	if ( time_min >= starttimes_min.get(v_eventIndex) ) { // is a trip starting this timestep?
     			//currentTripDuration = roundToInt(endtimes_min.get(v_eventIndex) - starttimes_min.get(v_eventIndex) / (energyModel.p_timeStep_h * 60));
     			currentTripTimesteps_n = max(1,roundToInt(((endtimes_min.get(v_eventIndex) - starttimes_min.get(v_eventIndex)) / (energyModel.p_timeStep_h * 60))));
+    			
     			Vehicle.startTrip();
+    			if(Vehicle instanceof J_EAEV EV) {
+    				chargePointRegistration.deregisterChargingRequest(EV);
+    			}
         		//if (time_min == roundToInt(endtimes_min.get(v_eventIndex) / (60*energyModel.p_timeStep_h)) * (energyModel.p_timeStep_h*60) ) { // is the trip also ending this timestep?
             	if (time_min >= endtimes_min.get(v_eventIndex) ) { // is the trip also ending this timestep?
         			Vehicle.endTrip(v_tripDist_km);
         			v_eventIndex++;
-        			prepareNextActivity(time_min);
+        			prepareNextActivity(time_min, chargePointRegistration);
         		}
     		}
-
     	} else {
     		if (Vehicle instanceof J_EADieselVehicle) {
     			J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)Vehicle;
@@ -138,18 +143,21 @@ else if (Vehicle instanceof J_EAHydrogenVehicle) {
         	if (time_min >= endtimes_min.get(v_eventIndex) ) { // is a trip ending this timestep?
     			Vehicle.endTrip(v_tripDist_km);
     			v_eventIndex++;
-    			prepareNextActivity(time_min);
+    			prepareNextActivity(time_min, chargePointRegistration);
         		//if (time_min == roundToInt(starttimes_min.get(v_eventIndex) / (60*energyModel.p_timeStep_h)) * (energyModel.p_timeStep_h*60) ) { // is the next trip also starting this timestep?
             	if (time_min >= starttimes_min.get(v_eventIndex) ) { // is the next trip also starting this timestep?
         			currentTripTimesteps_n = max(1,roundToInt(((endtimes_min.get(v_eventIndex) - starttimes_min.get(v_eventIndex)) / (energyModel.p_timeStep_h * 60))));
         			Vehicle.startTrip();
+        			if(Vehicle instanceof J_EAEV EV) {
+        				chargePointRegistration.deregisterChargingRequest(EV);
+        			}
         		}
     		}
 
     	}
     }
    
-   	public void setStartIndex(double t_h) {
+   	public void setStartIndex(double t_h, I_ChargePointRegistration chargePointRegistration) {
    		// 'forward' to current activity if tripTracker is instantiated not at the start of the simulation or year
    		double time_min = t_h * 60.0;
 	    while ( starttimes_min.get(v_eventIndex) < time_min ) {	
@@ -158,10 +166,10 @@ public void setStartIndex(double t_h) {
 	    		break;
 	    	}
 	    }
-	    prepareNextActivity(time_min);    	
+	    prepareNextActivity(time_min, chargePointRegistration);    	
    	}
     
-    public void prepareNextActivity(double time_min) {
+    public void prepareNextActivity(double time_min, I_ChargePointRegistration chargePointRegistration) {
 		if ( v_eventIndex >= starttimes_min.size()  ) {
 			v_eventIndex = 0;
 		}
@@ -173,8 +181,8 @@ public void prepareNextActivity(double time_min) {
 		if (Vehicle instanceof J_EAEV ev) {
 			
 			v_energyNeedForNextTrip_kWh = ev.energyConsumption_kWhpkm * v_tripDist_km;
-			if (v_idleTimeToNextTrip_min > 0 && (v_energyNeedForNextTrip_kWh-ev.getCurrentStateOfCharge_kWh())> v_idleTimeToNextTrip_min/60 * ev.capacityElectric_kW) {
-				traceln("TripTracker reports: charging need for next trip is not feasible! Time till next trip: %s hours, chargeNeed_kWh: %s", roundToDecimal(v_idleTimeToNextTrip_min/60,2), roundToDecimal(v_energyNeedForNextTrip_kWh-ev.getCurrentStateOfCharge_kWh(),2));
+			if (v_idleTimeToNextTrip_min > 0 && (v_energyNeedForNextTrip_kWh-ev.getCurrentSOC_kWh())> v_idleTimeToNextTrip_min/60 * ev.capacityElectric_kW) {
+				traceln("TripTracker reports: charging need for next trip is not feasible! Time till next trip: %s hours, chargeNeed_kWh: %s", roundToDecimal(v_idleTimeToNextTrip_min/60,2), roundToDecimal(v_energyNeedForNextTrip_kWh-ev.getCurrentSOC_kWh(),2));
 			}
 			v_energyNeedForNextTrip_kWh = min(v_energyNeedForNextTrip_kWh+10,ev.getStorageCapacity_kWh());  // added 10kWh margin 'just in case'. This is actually realistic; people will charge their cars a bit more than strictly needed for the next trip, if possible.
 			// Check if more charging is needed for next trip!
@@ -188,7 +196,7 @@ public void prepareNextActivity(double time_min) {
 				nextTripDist_km = distanceScaling_fr*distances_km.get( v_eventIndex+1 );
 				nextTripStartTime_min = starttimes_min.get( v_eventIndex+1 );
 			}
-			double additionalChargingNeededForNextTrip_kWh = max(0,nextTripDist_km * ev.energyConsumption_kWhpkm - (nextTripStartTime_min - endtimes_min.get(v_eventIndex))/60*ev.getCapacityElectric_kW());
+			double additionalChargingNeededForNextTrip_kWh = max(0,nextTripDist_km * ev.energyConsumption_kWhpkm - (nextTripStartTime_min - endtimes_min.get(v_eventIndex))/60*ev.getVehicleChargingCapacity_kW());
 			/*if (additionalChargingNeededForNextTrip_kWh>0) {
 				traceln("*******Additional charging required to prepare for trip after next trip!*********");
 			}*/
@@ -198,6 +206,9 @@ public void prepareNextActivity(double time_min) {
 				traceln("Infeasible trip pattern for EV, not enough time to charge for next trip! Required charging power is: " + (v_energyNeedForNextTrip_kWh - EV.getCurrentStateOfCharge() * EV.getStorageCapacity_kWh()) / (v_idleTimeToNextTrip_min/60) + " kW");
 				traceln("RowIndex: " + rowIndex + " tripDistance: " + v_tripDist_km + " km, time to next trip: " + v_idleTimeToNextTrip_min + " minutes");
 			} */
+			
+			//Register EV at the chargepoint
+			chargePointRegistration.registerChargingRequest(ev);
 		}
     }
     
@@ -213,6 +224,30 @@ public double getDistanceScaling_fr( ) {
 		return this.distanceScaling_fr;
 	}
 
+	@Override
+    public void storeAndResetState() {
+    	v_eventIndexStored = v_eventIndex;
+    	v_energyNeedForNextTripStored_kWh = v_energyNeedForNextTrip_kWh;
+    	v_idleTimeToNextTripStored_min = v_idleTimeToNextTrip_min;
+    	v_eventIndex = 0;
+    	v_energyNeedForNextTrip_kWh = 0;
+    	v_idleTimeToNextTrip_min = 0;
+    }
+	
+    @Override
+    public void restoreState() {
+    	v_eventIndex = v_eventIndexStored;
+	    v_nextEventStartTime_min = starttimes_min.get(v_eventIndex);
+		v_idleTimeToNextTrip_min = v_idleTimeToNextTripStored_min;
+		v_tripDist_km = distanceScaling_fr * distances_km.get( v_eventIndex ); // Update upcoming trip distance
+		v_energyNeedForNextTrip_kWh = v_energyNeedForNextTripStored_kWh;
+		
+		if(Vehicle instanceof J_EAEV ev) {
+			ev.energyNeedForNextTrip_kWh = v_energyNeedForNextTrip_kWh;
+		}
+	}
+    
+    
 	/**
 	 * This number is here for model snapshot storing purpose<br>
 	 * It needs to be changed when this class gets changed
diff --git a/_alp/Classes/Class.J_ChargePoint.java b/_alp/Classes/Class.J_ChargePoint.java
new file mode 100644
index 00000000..9a94027b
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargePoint.java
@@ -0,0 +1,180 @@
+/**
+ * J_ChargePoint
+ */	
+public class J_ChargePoint implements I_ChargePointRegistration{
+	
+	private boolean hasSocketRestrictions;
+	private int nbSockets;
+	private double maxChargeCapacityPerSocket_kW;
+	private List<Double> socketCapacitiesList_kW;
+	private boolean V1GCapable;
+	private boolean V2GCapable;
+	
+	private List<I_ChargingRequest> currentActiveChargingRequests = new ArrayList<>();
+	
+
+	private List<I_ChargingRequest> storedActiveChargingRequests = null;
+
+	/**
+     * Default constructor
+     * No restrictions on sockets
+     */
+    public J_ChargePoint(boolean V1GCapable, boolean V2GCapable ) {
+    	this.V1GCapable = V1GCapable;
+    	this.V2GCapable = V2GCapable;
+    	this.hasSocketRestrictions = false;
+    }
+
+   /**
+    * With equal restrictions on sockets
+    */
+   public J_ChargePoint(boolean V1GCapable, boolean V2GCapable, double maxChargeCapacityPerSocket_kW) {	
+   	this.V1GCapable = V1GCapable;
+   	this.V2GCapable = V2GCapable;
+   	this.addSocketRestrictions(maxChargeCapacityPerSocket_kW);
+   }
+   
+    /**
+     * With various restrictions on sockets
+     */
+    public J_ChargePoint(boolean V1GCapable, boolean V2GCapable, List<Double> socketCapacitiesList_kW) {	
+    	this.V1GCapable = V1GCapable;
+    	this.V2GCapable = V2GCapable;
+    	this.addSocketRestrictions(socketCapacitiesList_kW);
+    }
+    
+    
+    
+    //Charge chargingRequest trough socket
+    public void charge( I_ChargingRequest chargingRequest, double charge_kW ) {
+		if (charge_kW < 0 && !this.V2GCapable) {
+			throw new RuntimeException("Trying to do V2G trough a ChargePoint that is not V2GCapable");
+		}
+		chargingRequest.f_updateAllFlows( charge_kW / chargingRequest.getVehicleChargingCapacity_kW());
+    }
+    
+    protected void performCheck() { //This call will check if all chargingrequest have been charged in a timestep. 
+    	boolean check = true;
+    	if(!check) {
+    		throw new RuntimeException("Not all active charging requests where charged.");
+    	}
+    }
+    
+    
+    //Functions used by trip/charging session managers to (de)register at the J_ChargePoint
+    public void registerChargingRequest( I_ChargingRequest chargingRequest ) {
+    	// TODO: (Longterm) Make this more complex when we need to take socket restrictions into account.
+    	if(!isRegistered(chargingRequest)) {
+    		this.currentActiveChargingRequests.add(chargingRequest);
+    	}
+    	else {
+    		traceln("Trying to register a chargingrequest that is already registered!");
+    	}
+    }
+    public void deregisterChargingRequest( I_ChargingRequest chargingRequest ) {
+    	if(isRegistered(chargingRequest)) {
+    		this.currentActiveChargingRequests.remove(chargingRequest);
+    	}
+    	else {
+    		traceln("Trying to Deregister a chargingrequest that is not registered!");
+    	}
+    }    
+    public boolean isRegistered( I_ChargingRequest chargingRequest ) {
+    	return this.currentActiveChargingRequests.contains(chargingRequest);
+    }
+    
+    
+    public double getMaxChargingCapacity_kW(I_ChargingRequest chargingRequest) {
+    	if(hasSocketRestrictions) {
+    		return min(chargingRequest.getVehicleChargingCapacity_kW(), this.getSocketChargingCapacity_kW(chargingRequest));    		
+    	}
+    	else {
+    		return chargingRequest.getVehicleChargingCapacity_kW();
+    	}
+    }
+    
+	public double getChargeDeadline_h(I_ChargingRequest chargingRequest) {
+		double chargeNeedForNextTrip_kWh = chargingRequest.getRemainingChargeDemand_kWh();
+		double chargeTimeMargin_h = 0.5; // Margin to be ready with charging before start of next trip
+		double nextTripStartTime_h = chargingRequest.getLeaveTime_h();
+		double chargeDeadline_h = nextTripStartTime_h - (chargeNeedForNextTrip_kWh / this.getMaxChargingCapacity_kW(chargingRequest)) - chargeTimeMargin_h;
+		return chargeDeadline_h;    		
+	}
+	
+	
+    public void addSocketRestrictions( double maxChargeCapacityPerSocket_kW) {
+    	if(maxChargeCapacityPerSocket_kW <= 0) {
+    		throw new RuntimeException("Trying to add socket restrictions to a J_ChargePoint with maxChargeCapacityPerSocket_kW = " + maxChargeCapacityPerSocket_kW);
+    	}
+    	this.hasSocketRestrictions = true;
+    	this.maxChargeCapacityPerSocket_kW = maxChargeCapacityPerSocket_kW;
+    }
+    public void addSocketRestrictions( List<Double> socketCapacitiesList_kW) {
+    	for(Double socketCapacity_kW : socketCapacitiesList_kW) {
+    		if(socketCapacity_kW <= 0) {
+        		throw new RuntimeException("Trying to add a socket restrictionsList to a J_ChargePoint that contains a socketCapacity_kW of " + socketCapacity_kW);
+        	}
+    	}
+    	this.hasSocketRestrictions = true;
+    	this.socketCapacitiesList_kW = socketCapacitiesList_kW;
+    }
+  
+    private double getSocketChargingCapacity_kW(I_ChargingRequest chargingRequest) {
+    	if(hasSocketRestrictions) {
+    		if(socketCapacitiesList_kW == null) {
+    			return maxChargeCapacityPerSocket_kW;
+    		}
+    		else {
+    			return this.socketCapacitiesList_kW.get(getSocketIndexNb(chargingRequest));
+    		}
+    	}
+    	else {
+    		return chargingRequest.getVehicleChargingCapacity_kW();
+    	}
+    }
+    
+    private int getSocketIndexNb(I_ChargingRequest chargingRequest) {
+    	return this.currentActiveChargingRequests.indexOf(chargingRequest);
+    }
+    
+    //V1G and V2G capabilities setters/getters
+    public void setV1GCapability(boolean V1GCapable) {
+		this.V1GCapable = V1GCapable;
+	}
+	public void setV2GCapability(boolean V2GCapable) {
+		this.V2GCapable = V2GCapable;
+	}
+	public boolean getV1GCapable() {
+		return this.V1GCapable;
+	}
+	public boolean getV2GCapable() {
+		return this.V2GCapable;
+	}
+	
+	public int getCurrentNumberOfChargeRequests() {
+		return this.currentActiveChargingRequests.size();
+	}
+	
+	public List<I_ChargingRequest> getCurrentActiveChargingRequests(){
+		return this.currentActiveChargingRequests;
+	}
+	
+    public void storeStatesAndReset() {
+    	this.storedActiveChargingRequests = new ArrayList<>(this.currentActiveChargingRequests);
+    	this.currentActiveChargingRequests.clear();
+    }
+    
+    public void restoreStates() {
+    	this.currentActiveChargingRequests = new ArrayList<>(this.storedActiveChargingRequests);
+    	this.storedActiveChargingRequests.clear();
+    }
+    
+	@Override
+	public String toString() {
+		return "ChargePoint: hasSocketRestrictions: " + this.hasSocketRestrictions + 
+				", V1G: " + this.V1GCapable + ", V2G: " + this.V2GCapable + 
+				", ChargingCapacityPerSocket_kW: " + this.maxChargeCapacityPerSocket_kW +
+				", currentNrOfChargeRequests: " + this.currentActiveChargingRequests.size();
+				
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementGridBalancing.java b/_alp/Classes/Class.J_ChargingManagementGridBalancing.java
new file mode 100644
index 00000000..cc8d626d
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargingManagementGridBalancing.java
@@ -0,0 +1,104 @@
+/**
+ * J_ChargingManagementGridBalancing
+ */	
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import java.util.EnumSet;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+public class J_ChargingManagementGridBalancing implements I_ChargingManagement {
+
+    private GridConnection gc;
+    private double timeStep_h;
+    private OL_ChargingAttitude activeChargingType = OL_ChargingAttitude.SIMPLE;
+    private boolean V2GActive = false;
+
+    /**
+     * Default constructor
+     */
+    public J_ChargingManagementGridBalancing( GridConnection gc) {
+    	this.gc = gc;
+    	this.timeStep_h = gc.energyModel.p_timeParameters.getTimeStep_h();
+    }
+      
+    public OL_ChargingAttitude getCurrentChargingType() {
+    	return activeChargingType;
+    }
+    
+    /**
+     * One of the simplest charging algorithms.
+     * 
+     */
+    public void manageCharging(J_ChargePoint chargePoint) {
+    	double t_h = gc.energyModel.t_h;
+    
+    	for (I_ChargingRequest chargeRequest : chargePoint.getCurrentActiveChargingRequests()) {
+	    	double chargeSetpoint_kW = 0;
+			double maxChargePower = chargePoint.getMaxChargingCapacity_kW(chargeRequest);
+			double remainingChargeDemand_kWh = chargeRequest.getRemainingChargeDemand_kWh(); // Can be negative if recharging is not needed for next trip!
+	
+			GridNode parentNode = gc.p_parentNodeElectric;
+			double currentBalanceOnGridNodeWithoutEV_kW = parentNode.v_currentLoad_kW - parentNode.f_getCurrentChargingPowerBalancingThisGN_kW();
+	    	double gridNodeLowPassedLoad_kW = parentNode.v_lowPassedLoadFilter_kW;
+	    	
+			double nextTripStartTime_h = chargeRequest.getLeaveTime_h();
+			double chargeTimeMargin_h = 0.5; // Margin to be ready with charging before start of next trip
+			double chargeDeadline_h =  nextTripStartTime_h - remainingChargeDemand_kWh / maxChargePower - chargeTimeMargin_h;
+			double remainingFlexTime_h = chargeDeadline_h - t_h; // measure of flexiblity left in current charging session.
+			double remainingTimeToCharge = nextTripStartTime_h - t_h - chargeTimeMargin_h;
+			
+			if ( t_h >= chargeDeadline_h && remainingChargeDemand_kWh > 0) { // Must-charge time at max charging power
+				chargeSetpoint_kW = min(maxChargePower, remainingChargeDemand_kWh / this.timeStep_h);	
+			} else {
+				double flexGain_r_manual = 0.8;
+				double flexGain_r = 1/max(1, (double)parentNode.f_getCurrentNumberOfChargeRequestsBalancingThisGN()) * flexGain_r_manual; // how strongly to 'follow' currentBalanceBeforeEV_kW -> influenced by the amount of charging chargers at this momment
+				chargeSetpoint_kW = max(0, chargeRequest.getRemainingAverageChargingDemand_kW(t_h) + (gridNodeLowPassedLoad_kW - currentBalanceOnGridNodeWithoutEV_kW) * (min(1,flexGain_r)));			    				
+				if ( this.V2GActive && chargePoint.getV2GCapable() && chargeRequest.getV2GCapable() && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss flexibility
+					chargeSetpoint_kW = min(0, chargeRequest.getRemainingAverageChargingDemand_kW(t_h) + (gridNodeLowPassedLoad_kW - currentBalanceOnGridNodeWithoutEV_kW) * (min(1,flexGain_r)));
+				}    
+			}
+
+	    	//Send the chargepower setpoint to the chargepoint
+	       	chargePoint.charge(chargeRequest, chargeSetpoint_kW);
+    	}
+ 
+    }
+    
+	public void setV2GActive(boolean activateV2G) {
+		this.V2GActive = activateV2G;
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
+	}
+	
+	public boolean getV2GActive() {
+		return this.V2GActive;
+	}
+	
+	
+    //Get parentagent
+    public Agent getParentAgent() {
+    	return this.gc;
+    }
+    
+    //Store and reset states
+	public void storeStatesAndReset() {
+		
+	}
+	public void restoreStates() {
+
+	}
+	
+	
+    @Override
+	public String toString() {
+		return "Active charging type: " + this.activeChargingType;
+
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java b/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java
index 977b7b14..1b322681 100644
--- a/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java
+++ b/_alp/Classes/Class.J_ChargingManagementLocalBalancing.java
@@ -24,14 +24,11 @@ public class J_ChargingManagementLocalBalancing implements I_ChargingManagement
     
     //Stored
     private double storedGCdemandLowPassed_kW;
+    
     /**
      * Default constructor
      */
-    public J_ChargingManagementLocalBalancing() {
-    	
-    }
-    
-    public J_ChargingManagementLocalBalancing( GridConnection gc ) {
+    public J_ChargingManagementLocalBalancing( GridConnection gc) {
     	this.gc = gc;
     	this.filterDiffGain_r = 1/(filterTimeScale_h/gc.energyModel.p_timeStep_h);
     }
@@ -43,37 +40,36 @@ public OL_ChargingAttitude getCurrentChargingType() {
      * One of the simplest charging algorithms.
      * 
      */
-    public void manageCharging() {    	
+    public void manageCharging(J_ChargePoint chargePoint) {    	
     	double t_h = gc.energyModel.t_h;
+
     	// Use current GC-load (so without EV charging!) as an 'equivalent price' signal, and use EV battery flexibility to make local load flatter.
     	double currentBalanceBeforeEV_kW = gc.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
     	GCdemandLowPassed_kW += (currentBalanceBeforeEV_kW - GCdemandLowPassed_kW) * filterDiffGain_r;
     	
-    	for (J_EAEV ev : gc.c_electricVehicles) {
-    		if (ev.available) {
-    			double chargeNeedForNextTrip_kWh = ev.energyNeedForNextTrip_kWh - ev.getCurrentStateOfCharge_kWh(); // Can be negative if recharging is not needed for next trip!
-    			double remainingFlexTime_h = ev.getChargeDeadline_h() - t_h; // measure of flexiblity left in current charging session.
-    			double avgPowerDemandTillTrip_kW = ev.energyNeedForNextTrip_kWh / (ev.tripTracker.v_idleTimeToNextTrip_min / 60);
-    			double chargeSetpoint_kW = 0;    			
-    			if ( t_h >= (ev.getChargeDeadline_h()) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
-    				//traceln("Urgency charging in GC: %s! May exceed connection capacity!", gc.p_gridConnectionID));
-    				chargeSetpoint_kW = ev.getCapacityElectric_kW();	
-    			} else {
-    				double flexGain_r = 0.5; // how strongly to 'follow' currentBalanceBeforeEV_kW
-    				chargeSetpoint_kW = max(0, avgPowerDemandTillTrip_kW + (GCdemandLowPassed_kW - currentBalanceBeforeEV_kW) * (min(1,remainingFlexTime_h*flexGain_r)));			    				
-        			if ( ev.getV2GActive() && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss flexibility
-    					chargeSetpoint_kW = min(0, avgPowerDemandTillTrip_kW - (currentBalanceBeforeEV_kW - GCdemandLowPassed_kW) * (min(1,remainingFlexTime_h*flexGain_r)));
-    					//if (chargeSetpoint_kW < 0) {traceln(" V2G Active! Power: " + chargeSetpoint_kW );}
-    				}    
-    			}
-    			ev.f_updateAllFlows( chargeSetpoint_kW / ev.getCapacityElectric_kW() );    		
-    		}
+       	for (I_ChargingRequest chargingRequest : chargePoint.getCurrentActiveChargingRequests()) {
+			double chargeNeedForNextTrip_kWh = chargingRequest.getEnergyNeedForNextTrip_kWh() - chargingRequest.getCurrentSOC_kWh(); // Can be negative if recharging is not needed for next trip!
+			double remainingFlexTime_h = chargePoint.getChargeDeadline_h(chargingRequest) - t_h; // measure of flexiblity left in current charging session.
+			double avgPowerDemandTillTrip_kW = chargingRequest.getEnergyNeedForNextTrip_kWh() / (chargingRequest.getLeaveTime_h() - t_h);
+			double chargeSetpoint_kW = 0;    			
+			if ( t_h >= chargePoint.getChargeDeadline_h(chargingRequest) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
+				chargeSetpoint_kW = chargePoint.getMaxChargingCapacity_kW(chargingRequest);	
+			} else {
+				double flexGain_r = 0.5; // how strongly to 'follow' currentBalanceBeforeEV_kW
+				chargeSetpoint_kW = max(0, avgPowerDemandTillTrip_kW + (GCdemandLowPassed_kW - currentBalanceBeforeEV_kW) * (min(1,remainingFlexTime_h*flexGain_r)));			    				
+    			if ( this.V2GActive && chargePoint.getV2GCapable() && chargingRequest.getV2GCapable() && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss flexibility
+					chargeSetpoint_kW = min(0, avgPowerDemandTillTrip_kW - (currentBalanceBeforeEV_kW - GCdemandLowPassed_kW) * (min(1,remainingFlexTime_h*flexGain_r)));
+				}    
+			}
+	    	//Send the chargepower setpoint to the chargepoint			
+			chargePoint.charge(chargingRequest, chargeSetpoint_kW);  		
     	}
     }
 
 	public void setV2GActive(boolean activateV2G) {
 		this.V2GActive = activateV2G;
-		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // not really wanted but NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
 	}
 	
 	public boolean getV2GActive() {
@@ -86,8 +82,6 @@ public boolean getV2GActive() {
     public Agent getParentAgent() {
     	return this.gc;
     }
-    
-    
 	
     //Store and reset states
 	public void storeStatesAndReset() {
@@ -103,11 +97,4 @@ public String toString() {
 		return "Active charging type: " + this.activeChargingType;
 
 	}
-
-	/**
-	 * This number is here for model snapshot storing purpose<br>
-	 * It needs to be changed when this class gets changed
-	 */ 
-	private static final long serialVersionUID = 1L;
-
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java b/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java
index 93412e48..fe1db1d9 100644
--- a/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java
+++ b/_alp/Classes/Class.J_ChargingManagementMaxAvailablePower.java
@@ -18,13 +18,11 @@ public class J_ChargingManagementMaxAvailablePower implements I_ChargingManageme
     private OL_ChargingAttitude activeChargingType = OL_ChargingAttitude.MAX_POWER;
     
     private boolean V2GActive = false;
+    
     /**
      * Default constructor
      */
-    public J_ChargingManagementMaxAvailablePower() {
-    }
-    
-    public J_ChargingManagementMaxAvailablePower( GridConnection gc ) {
+    public J_ChargingManagementMaxAvailablePower( GridConnection gc) {
     	this.gc = gc;
     }
     
@@ -32,44 +30,43 @@ public OL_ChargingAttitude getCurrentChargingType() {
     	return activeChargingType;
     }
     
-    public void manageCharging() {
+    public void manageCharging(J_ChargePoint chargePoint) {
     	double t_h = gc.energyModel.t_h;
+
     	double remainingChargingPower_kW = gc.v_liveConnectionMetaData.contractedDeliveryCapacity_kW - gc.fm_currentBalanceFlows_kW.get(ELECTRICITY);
     	if (gc.p_batteryAsset!=null) {
     		remainingChargingPower_kW += gc.p_batteryAsset.getCapacityAvailable_kW();
     	}
-    	ArrayList<J_EAEV> copiedVehicleList = new ArrayList<J_EAEV>();
-    	gc.c_electricVehicles.forEach(ev -> {if(ev.getAvailability() && ev.getCurrentStateOfCharge_fr()<1) { copiedVehicleList.add(ev);}}); // only vehicle that are available and not full
-    	int countDeletedItems = 0;
+    	ArrayList<I_ChargingRequest> copiedChargingRequestList = new ArrayList<>(chargePoint.getCurrentActiveChargingRequests());
+    	//this.chargePoint.getCurrentActiveChargingRequests().forEach(chargingRequest -> {if(ev.getAvailability() && ev.getCurrentStateOfCharge_fr()<1) { copiedVehicleList.add(ev);}}); // only vehicle that are available and not full
+    	//int countDeletedItems = 0;
 
-    	// Sort vehicles by time until charge deadline
-    	copiedVehicleList.sort((ev1, ev2) -> Double.compare(ev1.getChargeDeadline_h(), ev2.getChargeDeadline_h()));
+    	// Sort chargingRequests by time until charge deadline
+    	copiedChargingRequestList.sort((chargingRequest1, chargingRequest2) -> Double.compare(chargePoint.getChargeDeadline_h(chargingRequest1), chargePoint.getChargeDeadline_h(chargingRequest2)));
 
-    	for ( J_EAEV ev :  copiedVehicleList){
-    		//J_EAEV ev = copiedVehicleList.get(i);
-    		if (ev.vehicleScaling != 0) {
-				double chargeNeedForNextTrip_kWh = max(0, ev.getEnergyNeedForNextTrip_kWh() - ev.getCurrentStateOfCharge_kWh());
-				//traceln("chargeNeedForNextTrip_kWh: " + chargeNeedForNextTrip_kWh);
-				
-				double chargingSetpoint_kW;
-				if ( t_h >= ev.getChargeDeadline_h() && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
-					//traceln("Urgency charging! May exceed connection capacity!");
-					chargingSetpoint_kW = ev.getCapacityElectric_kW();	
-				}
-				else {
-					chargingSetpoint_kW = remainingChargingPower_kW;
-				}
-				
-				double chargingPower_kW = min(max(0,chargingSetpoint_kW), ev.getCapacityElectric_kW());
-				ev.f_updateAllFlows( chargingPower_kW / ev.getCapacityElectric_kW() );
-				remainingChargingPower_kW = max(0, remainingChargingPower_kW - chargingPower_kW); // Assumes the asset complies with the command!   			
-    		}
+    	for ( I_ChargingRequest chargingRequest : copiedChargingRequestList){
+			double chargeNeedForNextTrip_kWh = max(0, chargingRequest.getEnergyNeedForNextTrip_kWh() - chargingRequest.getCurrentSOC_kWh());
+			
+			double chargingSetpoint_kW;
+			if ( t_h >= chargePoint.getChargeDeadline_h(chargingRequest) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
+				chargingSetpoint_kW =  chargePoint.getMaxChargingCapacity_kW(chargingRequest);	
+			}
+			else {
+				chargingSetpoint_kW = remainingChargingPower_kW;
+			}
+			
+			double chargingPower_kW = min(max(0,chargingSetpoint_kW), chargePoint.getMaxChargingCapacity_kW(chargingRequest));
+			
+			//Send the chargepower setpoints to the chargepoint
+	       	chargePoint.charge(chargingRequest, chargingPower_kW); 
+			remainingChargingPower_kW = max(0, remainingChargingPower_kW - chargingPower_kW); // Assumes the asset complies with the command!   			
     	}
     }
     
 	public void setV2GActive(boolean activateV2G) {
 		this.V2GActive = activateV2G;
-		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // not really wanted but NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
 	}
 	
 	public boolean getV2GActive() {
@@ -86,10 +83,10 @@ public Agent getParentAgent() {
     
 	//Store and reset states
 	public void storeStatesAndReset() {
-		//Nothing to store and reset
+		
 	}
 	public void restoreStates() {
-		//Nothing to restore
+		
 	}
 	
 	
@@ -98,11 +95,4 @@ public String toString() {
 		return "Active charging type: " + this.activeChargingType;
 
 	}
-
-	/**
-	 * This number is here for model snapshot storing purpose<br>
-	 * It needs to be changed when this class gets changed
-	 */ 
-	private static final long serialVersionUID = 1L;
-
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementOffPeak.java b/_alp/Classes/Class.J_ChargingManagementOffPeak.java
index 6a54b4dc..a5c2141f 100644
--- a/_alp/Classes/Class.J_ChargingManagementOffPeak.java
+++ b/_alp/Classes/Class.J_ChargingManagementOffPeak.java
@@ -28,14 +28,11 @@ public class J_ChargingManagementOffPeak implements I_ChargingManagement {
     
     //Stored
     private double storedGCdemandLowPassed_kW;
+    
     /**
      * Default constructor
      */
-    public J_ChargingManagementOffPeak() {
-    	
-    }
-    
-    public J_ChargingManagementOffPeak( GridConnection gc ) {
+    public J_ChargingManagementOffPeak( GridConnection gc) {
     	this.gc = gc;
     	this.filterDiffGain_r = 1/(filterTimeScale_h/gc.energyModel.p_timeStep_h);
     }
@@ -48,8 +45,9 @@ public OL_ChargingAttitude getCurrentChargingType() {
      * One of the simplest charging algorithms.
      * 
      */
-    public void manageCharging() {    	
+    public void manageCharging(J_ChargePoint chargePoint) {    	
     	double t_h = gc.energyModel.t_h;
+   
     	// Use current GC-load (so without EV charging!) as an 'equivalent price' signal, and use EV battery flexibility to make local load flatter.
     	double currentBalanceBeforeEV_kW = gc.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
     	GCdemandLowPassed_kW += (currentBalanceBeforeEV_kW - GCdemandLowPassed_kW) * filterDiffGain_r;
@@ -62,30 +60,30 @@ public void manageCharging() {
 		double intervalEndTimeSinceModelStart_hr = t_h - ((t_h - startTimeOfReducedChargingInterval_hr + 24) % 24) + intervalLength_hr;
 		boolean timeIsInReducedChargingInterval = ((hourOfTheDay - startTimeOfReducedChargingInterval_hr + 24) % 24) < intervalLength_hr;
 
-    	for (J_EAEV ev : gc.c_electricVehicles) {
-    		if (ev.available) {
-    			double chargeNeedForNextTrip_kWh = ev.energyNeedForNextTrip_kWh - ev.getCurrentStateOfCharge_kWh(); // Can be negative if recharging is not needed for next trip!
-    			double chargeSetpoint_kW = 0;    			
-    			if ( t_h >= (ev.getChargeDeadline_h()) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
-    				//traceln("Urgency charging in GC: %s! May exceed connection capacity!", gc.p_gridConnectionID));
-    				chargeSetpoint_kW = ev.getCapacityElectric_kW();	
-    			} else {
-    				if(timeIsInReducedChargingInterval && chargeNeedForNextTrip_kWh > 0) {
-	    				double chargeTimeMargin_h = 0.5; // Margin to be ready with charging before start of next trip
-	    				double timeBetweenEndOfIntervalAndNextTripStartTime_hr = max(0, ev.getNextTripStartTime_h() - intervalEndTimeSinceModelStart_hr - chargeTimeMargin_h);
-	    				double energyThatCanBeChargedAfterIntervalEnded_kWh = timeBetweenEndOfIntervalAndNextTripStartTime_hr * ev.getCapacityElectric_kW();
-	    				double energyThatNeedsToBeChargedDuringInterval_kWh = max(0, chargeNeedForNextTrip_kWh - energyThatCanBeChargedAfterIntervalEnded_kWh);
-	    		    	
-	    				double avgPowerDemandTillEndOfInterval_kW = energyThatNeedsToBeChargedDuringInterval_kWh / (intervalEndTimeSinceModelStart_hr - t_h);
-	    				chargeSetpoint_kW = avgPowerDemandTillEndOfInterval_kW;
-    				}
-    				else { // Dom laden (??????) // Of max spread laden?
-    					chargeSetpoint_kW = ev.getCapacityElectric_kW();
-    				}
-    			}
-    			ev.f_updateAllFlows( chargeSetpoint_kW / ev.getCapacityElectric_kW() );    		
-    		}
+       	for (I_ChargingRequest chargingRequest : chargePoint.getCurrentActiveChargingRequests()) {
+			double chargeNeedForNextTrip_kWh = chargingRequest.getEnergyNeedForNextTrip_kWh() - chargingRequest.getCurrentSOC_kWh(); // Can be negative if recharging is not needed for next trip!
+			double chargeSetpoint_kW = 0;    			
+			if ( t_h >= chargePoint.getChargeDeadline_h(chargingRequest) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
+				chargeSetpoint_kW = chargePoint.getMaxChargingCapacity_kW(chargingRequest);	
+			} else {
+				if(timeIsInReducedChargingInterval && chargeNeedForNextTrip_kWh > 0) {
+    				double chargeTimeMargin_h = 0.5; // Margin to be ready with charging before start of next trip
+    				double timeBetweenEndOfIntervalAndNextTripStartTime_hr = max(0, chargingRequest.getLeaveTime_h() - intervalEndTimeSinceModelStart_hr - chargeTimeMargin_h);
+    				double energyThatCanBeChargedAfterIntervalEnded_kWh = timeBetweenEndOfIntervalAndNextTripStartTime_hr * chargePoint.getMaxChargingCapacity_kW(chargingRequest);
+    				double energyThatNeedsToBeChargedDuringInterval_kWh = max(0, chargeNeedForNextTrip_kWh - energyThatCanBeChargedAfterIntervalEnded_kWh);
+    		    	
+    				double avgPowerDemandTillEndOfInterval_kW = energyThatNeedsToBeChargedDuringInterval_kWh / (intervalEndTimeSinceModelStart_hr - t_h);
+    				chargeSetpoint_kW = avgPowerDemandTillEndOfInterval_kW;
+				}
+				else { // Dom laden
+					chargeSetpoint_kW = chargePoint.getMaxChargingCapacity_kW(chargingRequest);
+				}
+			}
+	    	//Send the chargepower setpoints to the chargepoint
+	       	chargePoint.charge(chargingRequest, chargeSetpoint_kW); 
     	}
+    	
+
     }
 
     public void setStartTimeOfReducedChargingInterval_hr(double startTimeOfReducedChargingInterval_hr) {
@@ -106,7 +104,8 @@ public double getEndTimeOfReducedChargingInterval_hr() {
     
 	public void setV2GActive(boolean activateV2G) {
 		this.V2GActive = activateV2G;
-		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // not really wanted but NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
 	}
 	
 	public boolean getV2GActive() {
@@ -120,7 +119,6 @@ public Agent getParentAgent() {
     	return this.gc;
     }
     
-    
     //Store and reset states
 	public void storeStatesAndReset() {
 		this.storedGCdemandLowPassed_kW = this.GCdemandLowPassed_kW;
@@ -134,11 +132,4 @@ public void restoreStates() {
 	public String toString() {
 		return "Active charging type: " + this.activeChargingType;
 	}
-
-	/**
-	 * This number is here for model snapshot storing purpose<br>
-	 * It needs to be changed when this class gets changed
-	 */ 
-	private static final long serialVersionUID = 1L;
-
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementPrice.java b/_alp/Classes/Class.J_ChargingManagementPrice.java
index 166670be..a0fa8177 100644
--- a/_alp/Classes/Class.J_ChargingManagementPrice.java
+++ b/_alp/Classes/Class.J_ChargingManagementPrice.java
@@ -28,11 +28,7 @@ public class J_ChargingManagementPrice implements I_ChargingManagement {
     /**
      * Default constructor
      */
-    public J_ChargingManagementPrice() {
-    	
-    }
-    
-    public J_ChargingManagementPrice( GridConnection gc ) {
+    public J_ChargingManagementPrice( GridConnection gc) {
     	this.gc = gc;
     	this.priceFilterDiffGain_r = 1/(priceFilterTimeScale_h/gc.energyModel.p_timeStep_h);
     }
@@ -44,39 +40,40 @@ public OL_ChargingAttitude getCurrentChargingType() {
      * One of the simplest charging algorithms.
      * 
      */
-    public void manageCharging() {
+    public void manageCharging(J_ChargePoint chargePoint) {
     	double t_h = gc.energyModel.t_h;
+
     	//double currentElectricityPriceConsumption_eurpkWh = gc.p_owner.f_getElectricityPrice(gc.v_liveConnectionMetaData.contractedDeliveryCapacity_kW);
     	double currentElectricityPriceConsumption_eurpkWh = gc.energyModel.pp_dayAheadElectricityPricing_eurpMWh.getCurrentValue() * 0.001;
     	electricityPriceLowPassed_eurpkWh += (currentElectricityPriceConsumption_eurpkWh-electricityPriceLowPassed_eurpkWh) * priceFilterDiffGain_r ;
-       	for (J_EAEV ev : gc.c_electricVehicles) {
-    		if (ev.available) {
-    			double chargeNeedForNextTrip_kWh = ev.energyNeedForNextTrip_kWh - ev.getCurrentStateOfCharge_kWh(); // Can be negative if recharging is not needed for next trip!
-    			double remainingFlexTime_h = ev.getChargeDeadline_h() - t_h; // measure of flexiblity left in current charging session.
-    			double WTPoffset_eurpkW = 0.01; // Drops willingness to pay price for charging, combined with remainingFlexTime_h.
-    			double chargeSetpoint_kW = 0;    			
-    			if ( t_h >= (ev.getChargeDeadline_h()) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
-    				chargeSetpoint_kW = ev.getCapacityElectric_kW();	
-    			} else {
-    				double WTPCharging_eurpkWh = electricityPriceLowPassed_eurpkWh - WTPoffset_eurpkW * remainingFlexTime_h;  //+ urgencyGain_eurpkWh * ( max(0,maxSpreadChargingPower_kW) / ev.getCapacityElectric_kW() ); // Scale WTP based on flexibility expressed in terms of power-fraction
-    				//WTPprice_eurpkWh = WTPoffset_eurpkWh + (main.v_epexNext24hours_eurpkWh+v_electricityPriceLowPassed_eurpkWh)/2 + flexibilityGain_eurpkWh * sqrt(maxSpreadChargingPower_kW/maxChargingPower_kW); 
-    				double priceGain_r = 0.5; // When WTP is higher than current electricity price, ramp up charging power with this gain based on the price-delta.
-    				chargeSetpoint_kW = max(0, ev.getCapacityElectric_kW() * (WTPCharging_eurpkWh / currentElectricityPriceConsumption_eurpkWh - 1) * priceGain_r);			
-    				//if ( chargeNeedForNextTrip_kWh < -ev.getCapacityElectric_kW()*gc.energyModel.p_timeStep_h && chargeSetpoint_kW == 0 ) { // Surpluss SOC and high energy price
-        			if ( this.V2GActive && ev.getV2GCapable() && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss SOC and high energy price
-    	    			double V2G_WTS_offset_eurpkWh = 0.02; // Price must be at least this amount above the moving average to decide to discharge EV battery.
-    					double WTSV2G_eurpkWh = V2G_WTS_offset_eurpkWh + electricityPriceLowPassed_eurpkWh; // Scale WillingnessToSell based on flexibility expressed in terms of power-fraction
-    					chargeSetpoint_kW = min(0, -ev.getCapacityElectric_kW() * (currentElectricityPriceConsumption_eurpkWh / WTSV2G_eurpkWh - 1) * priceGain_r);
-    				}    
-    			}
-    			ev.f_updateAllFlows( chargeSetpoint_kW / ev.getCapacityElectric_kW() );    		
-    		}
+       	for (I_ChargingRequest chargingRequest : chargePoint.getCurrentActiveChargingRequests()) {
+			double chargeNeedForNextTrip_kWh = chargingRequest.getEnergyNeedForNextTrip_kWh() - chargingRequest.getCurrentSOC_kWh(); // Can be negative if recharging is not needed for next trip!
+			double remainingFlexTime_h = chargePoint.getChargeDeadline_h(chargingRequest) - t_h; // measure of flexiblity left in current charging session.
+			double WTPoffset_eurpkW = 0.01; // Drops willingness to pay price for charging, combined with remainingFlexTime_h.
+			double chargeSetpoint_kW = 0;    			
+			if ( t_h >= chargePoint.getChargeDeadline_h(chargingRequest) && chargeNeedForNextTrip_kWh > 0) { // Must-charge time at max charging power
+				chargeSetpoint_kW = chargePoint.getMaxChargingCapacity_kW(chargingRequest);	
+			} else {
+				double WTPCharging_eurpkWh = electricityPriceLowPassed_eurpkWh - WTPoffset_eurpkW * remainingFlexTime_h;  //+ urgencyGain_eurpkWh * ( max(0,maxSpreadChargingPower_kW) / ev.getCapacityElectric_kW() ); // Scale WTP based on flexibility expressed in terms of power-fraction
+				//WTPprice_eurpkWh = WTPoffset_eurpkWh + (main.v_epexNext24hours_eurpkWh+v_electricityPriceLowPassed_eurpkWh)/2 + flexibilityGain_eurpkWh * sqrt(maxSpreadChargingPower_kW/maxChargingPower_kW); 
+				double priceGain_r = 0.5; // When WTP is higher than current electricity price, ramp up charging power with this gain based on the price-delta.
+				chargeSetpoint_kW = max(0, chargePoint.getMaxChargingCapacity_kW(chargingRequest) * (WTPCharging_eurpkWh / currentElectricityPriceConsumption_eurpkWh - 1) * priceGain_r);			
+				//if ( chargeNeedForNextTrip_kWh < -ev.getCapacityElectric_kW()*gc.energyModel.p_timeStep_h && chargeSetpoint_kW == 0 ) { // Surpluss SOC and high energy price
+    			if ( this.V2GActive && chargePoint.getV2GCapable() && chargingRequest.getV2GCapable() && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss SOC and high energy price
+	    			double V2G_WTS_offset_eurpkWh = 0.02; // Price must be at least this amount above the moving average to decide to discharge EV battery.
+					double WTSV2G_eurpkWh = V2G_WTS_offset_eurpkWh + electricityPriceLowPassed_eurpkWh; // Scale WillingnessToSell based on flexibility expressed in terms of power-fraction
+					chargeSetpoint_kW = min(0, -chargePoint.getMaxChargingCapacity_kW(chargingRequest) * (currentElectricityPriceConsumption_eurpkWh / WTSV2G_eurpkWh - 1) * priceGain_r);
+				}    
+			}
+	    	//Send the chargepower setpoints to the chargepoint
+	       	chargePoint.charge(chargingRequest, chargeSetpoint_kW);					
     	}
     }
 
 	public void setV2GActive(boolean activateV2G) {
 		this.V2GActive = activateV2G;
-		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // not really wanted but NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_electricVehicles.forEach(ev -> ev.setV2GActive(activateV2G)); // NEEDED TO HAVE EV ASSET IN CORRECT assetFlowCatagory
+		this.gc.c_chargingSessions.forEach(cs -> cs.setV2GActive(activateV2G)); // NEEDED TO HAVE CS ASSET IN CORRECT assetFlowCatagory
 	}
 	
 	public boolean getV2GActive() {
@@ -91,7 +88,6 @@ public Agent getParentAgent() {
     	return this.gc;
     }
     
-    
     //Store and reset states
 	public void storeStatesAndReset() {
 		this.storedElectricityPriceLowPassed_eurpkWh = this.electricityPriceLowPassed_eurpkWh;
@@ -107,10 +103,4 @@ public String toString() {
  		return "Active charging type: " + this.activeChargingType;
 
  	}
-	/**
-	 * This number is here for model snapshot storing purpose<br>
-	 * It needs to be changed when this class gets changed
-	 */ 
-	private static final long serialVersionUID = 1L;
-
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingManagementSimple.java b/_alp/Classes/Class.J_ChargingManagementSimple.java
index b5814407..899d77e4 100644
--- a/_alp/Classes/Class.J_ChargingManagementSimple.java
+++ b/_alp/Classes/Class.J_ChargingManagementSimple.java
@@ -13,6 +13,7 @@
     setterVisibility = Visibility.NONE,
     creatorVisibility = Visibility.NONE
 )
+
 public class J_ChargingManagementSimple implements I_ChargingManagement {
 
     private GridConnection gc;
@@ -22,11 +23,7 @@ public class J_ChargingManagementSimple implements I_ChargingManagement {
     /**
      * Default constructor
      */
-    public J_ChargingManagementSimple() {
-    	
-    }
-    
-    public J_ChargingManagementSimple( GridConnection gc ) {
+    public J_ChargingManagementSimple( GridConnection gc) {
     	this.gc = gc;
     }
       
@@ -38,13 +35,11 @@ public OL_ChargingAttitude getCurrentChargingType() {
      * One of the simplest charging algorithms.
      * 
      */
-    public void manageCharging() {
+    public void manageCharging(J_ChargePoint chargePoint) {
     	double t_h = gc.energyModel.t_h;
-    	for (J_EAEV ev : gc.c_electricVehicles) {
-    		if (ev.available) {			
-	    		// just charge 'dumb', full power until full
-	    		ev.f_updateAllFlows(1.0);
-    		}
+
+    	for (I_ChargingRequest chargeRequest : chargePoint.getCurrentActiveChargingRequests()) {
+    		chargePoint.charge(chargeRequest, chargePoint.getMaxChargingCapacity_kW(chargeRequest));
     	}
     }
     
@@ -66,10 +61,10 @@ public Agent getParentAgent() {
     
     //Store and reset states
 	public void storeStatesAndReset() {
-		//Noting to reset and store
+		
 	}
 	public void restoreStates() {
-		//Nothing to restore
+		
 	}
 	
 	
@@ -78,11 +73,4 @@ public String toString() {
 		return "Active charging type: " + this.activeChargingType;
 
 	}
-
-	/**
-	 * This number is here for model snapshot storing purpose<br>
-	 * It needs to be changed when this class gets changed
-	 */ 
-	private static final long serialVersionUID = 1L;
-
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingSession.java b/_alp/Classes/Class.J_ChargingSession.java
deleted file mode 100644
index 72b6fb01..00000000
--- a/_alp/Classes/Class.J_ChargingSession.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * J_ChargingSession
- */	
-public class J_ChargingSession implements Serializable {
-
-	double startTime_h;
-	double endTime_h;
-	double timeStep_h;
-	double chargingDemand_kWh;
-	double avgPowerDemand_kW;
-	double batterySize_kWh;
-	double stateOfCharge_kWh;
-	double vehicleMaxChargingPower_kW;
-	int socketNb;
-	
-	//boolean V1GCapable = true;
-	//boolean V2GCapable = true;
-	double chargedDuringSession_kWh = 0;
-	double dischargedDuringSession_kWh = 0;
-	
-	
-    /**
-     * Default constructor
-     */
-    public J_ChargingSession(double startTime_quarterhours, double endTime_quarterhours, double chargingDemand_kWh, double batterySize_kWh, double chargingPower_kW, int socketNb, double timeStep_h) {
-    
-    	this.startTime_h = 0.25 * startTime_quarterhours;
-    	this.endTime_h = 0.25 * endTime_quarterhours;
-    	this.timeStep_h = timeStep_h;
-    	this.chargingDemand_kWh = chargingDemand_kWh;
-    	this.avgPowerDemand_kW = this.chargingDemand_kWh / (this.endTime_h - this.startTime_h);
-    	this.batterySize_kWh = batterySize_kWh;
-    	this.socketNb = socketNb-1;
-    	//stateOfCharge_kWh = batterySize_kWh - chargingDemand_kWh; // bold assumption... basically means every vehicle ends full. The reality is somewhere between: vehicle starts empty and vehicle ends full. 
-    	stateOfCharge_kWh = 0.5*(batterySize_kWh - chargingDemand_kWh); // Assumption: battery is not completely empty at start, and not completely full when leaving
-    	this.vehicleMaxChargingPower_kW = chargingPower_kW; 
-    	
-    	if(this.startTime_h > this.endTime_h){
-    		new RuntimeException("StartTime is later then the endtime for J_ChargingSession");
-    	}
-    }
-    
-    public double charge(double chargeSetpoint_kW) {    	
-    	double actualChargePower_kW = max(min(chargeSetpoint_kW, (batterySize_kWh - stateOfCharge_kWh) / timeStep_h), -stateOfCharge_kWh  / timeStep_h); // Limit charge power to stay within SoC 0-100    
-    	stateOfCharge_kWh += actualChargePower_kW * timeStep_h;
-    	chargedDuringSession_kWh+=max(0, actualChargePower_kW*this.timeStep_h);
-    	dischargedDuringSession_kWh+=max(0, -actualChargePower_kW*this.timeStep_h);     	
-    	return actualChargePower_kW;
-    }
-    
-    public double getRemainingChargeDemand_kWh() {
-    	return chargingDemand_kWh - chargedDuringSession_kWh + dischargedDuringSession_kWh;
-    }
-    
-    public J_ChargingSession getClone() {
-    	return new J_ChargingSession((this.startTime_h*4), (this.endTime_h*4), this.chargingDemand_kWh, this.batterySize_kWh, this.vehicleMaxChargingPower_kW, this.socketNb, this.timeStep_h);
-    }
-    
-   
-	@Override
-	public String toString() {
-		return "StartTime_h: " + startTime_h + ", endTime_h: " + endTime_h + ", Pmax: " + vehicleMaxChargingPower_kW + "kW, demand: " + chargingDemand_kWh + "kWh";
-	}
-
-	/**
-	 * This number is here for model snapshot storing purpose<br>
-	 * It needs to be changed when this class gets changed
-	 */ 
-	private static final long serialVersionUID = 1L;
-
-}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_ChargingSessionData.java b/_alp/Classes/Class.J_ChargingSessionData.java
new file mode 100644
index 00000000..187f972e
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargingSessionData.java
@@ -0,0 +1,106 @@
+/**
+ * J_ChargingSessionData
+ */	
+public class J_ChargingSessionData {
+	private double startTime_h;
+	private double endTime_h;
+	private double timeStep_h;
+	private double chargingDemand_kWh;
+	private double batterySize_kWh;
+	private double initialSOC_kWh;
+	private double vehicleMaxChargingPower_kW;
+	private int socketNb;
+	
+	private boolean V2GCapable = true;
+
+	
+	private boolean V2GCapabilityIsOverriden = false;
+	private boolean V2GCapableOverride = true;
+	
+    /**
+     * Default constructor
+     */
+    public J_ChargingSessionData(double startTime_quarterhours, double endTime_quarterhours, double chargingDemand_kWh, double batterySize_kWh, double chargingPower_kW, int socketNb, boolean V2GCapable, double timeStep_h) {
+    
+    	this.startTime_h = 0.25 * startTime_quarterhours;
+    	this.endTime_h = 0.25 * endTime_quarterhours;
+    	this.chargingDemand_kWh = chargingDemand_kWh;
+    	this.batterySize_kWh = batterySize_kWh;
+    	this.vehicleMaxChargingPower_kW = chargingPower_kW; 
+    	this.initialSOC_kWh = 0; //Required to be 0, to prevent jumps in energy in the model
+    	this.socketNb = socketNb-1;
+    	this.V2GCapable = V2GCapable;
+    	this.timeStep_h = timeStep_h;
+    	if(this.startTime_h > this.endTime_h){
+    		new RuntimeException("StartTime is later then the endtime for J_ChargingSession");
+    	}
+    	
+    	//Override to get continious energy balance!
+    	if(true) {
+	    	this.initialSOC_kWh = 0; //Required to be 0, to prevent jumps in energy in the model
+	    	this.batterySize_kWh = chargingDemand_kWh; //-> Equal to charging demand, as initial SOC starts
+    	}
+    }
+    
+    public double getStartTime_h() {
+    	return this.startTime_h;
+    }
+    
+	public double getLeaveTime_h() {
+		return this.endTime_h;
+	}
+
+	public double getChargingCapacity_kW() {
+		return this.vehicleMaxChargingPower_kW;
+	}
+	
+	public double getStorageCapacity_kWh() {
+		return this.batterySize_kWh;
+	}
+	
+	public double getInitialSOC_kWh() {
+		return this.initialSOC_kWh;
+	}
+
+    public double getEnergyNeededForNextTrip_kWh() {
+    	return this.chargingDemand_kWh;
+    }
+    
+    public J_ChargingSessionData getClone() {
+    	return new J_ChargingSessionData((this.startTime_h*4), (this.endTime_h*4), this.chargingDemand_kWh, this.batterySize_kWh, this.vehicleMaxChargingPower_kW, this.socketNb, this.V2GCapable, this.timeStep_h);
+    }
+    
+	public double getVehicleScaling_fr() {
+		return 1.0;
+	}
+	
+	public boolean getV2GCapable() {
+		if(this.V2GCapabilityIsOverriden) {
+			return this.V2GCapableOverride;
+		}
+		else {
+			return this.V2GCapable;
+		}
+	}
+    
+	public int getSocketNb() {
+	    return this.socketNb;
+	}
+	
+	public boolean getAvailability(double t_h) {
+		return this.startTime_h < t_h && t_h < this.endTime_h;
+	}
+
+	
+	public void overrideV2GCapability(boolean V2GCapabilityIsOverriden, boolean V2GCapableOverride) {
+		this.V2GCapabilityIsOverriden = V2GCapabilityIsOverriden;
+		if(this.V2GCapabilityIsOverriden) {
+			this.V2GCapableOverride = V2GCapableOverride;
+		}
+	}
+   
+	@Override
+	public String toString() {
+		return "StartTime_h: " + startTime_h + ", endTime_h: " + endTime_h + ", Pmax: " + vehicleMaxChargingPower_kW + "kW, demand: " + chargingDemand_kWh + "kWh";
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_EAChargePoint.java b/_alp/Classes/Class.J_EAChargePoint.java
deleted file mode 100644
index b62a6334..00000000
--- a/_alp/Classes/Class.J_EAChargePoint.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/**
- * J_EAChargePoint
- */	
-public class J_EAChargePoint extends zero_engine.J_EA implements Serializable {
-		public double discharged_kWh;
-		public double charged_kWh;
-		public double capacityElectric_kW;
-		public List<J_ChargingSession> chargeSessionList;
-		private boolean V1GCapable;
-		private boolean V2GCapable;
-		private boolean V2GActive = false;
-		private int nbSockets;
-		private int[] nextSessionIdxs;// = 0;
-		
-		private J_ChargingSession[] currentChargingSessions;
-		
-		private int currentNumberOfChargingSockets = 0; // Used for certain charging algorithms
-		
-		// For filtered price
-		private double electricityPriceLowPassed_eurpkWh = 0.1;
-		private double priceFilterTimeScale_h = 5*24;
-		
-		//
-		private double dischargedStored_kWh;
-		private double chargedStored_kWh;
-		private J_ChargingSession[] currentChargingSessionsStored;
-		private int[] nextSessionIdxsStored;
-		
-		//Charging attitude
-		private OL_ChargingAttitude chargingAttitude = OL_ChargingAttitude.SIMPLE;
-		
-	    /**
-	     * Default constructor
-	     */
-	    public J_EAChargePoint(Agent parentAgent, double electricCapacity_kW, double timestep_h, List<J_ChargingSession> chargeSessionList, boolean V1GCapable, boolean V2GCapable, int nbSockets) {
-	    	this.parentAgent = parentAgent;
-	    	this.capacityElectric_kW = electricCapacity_kW;
-	    	this.timestep_h = timestep_h;
-	    	this.chargeSessionList = chargeSessionList;
-		    this.V1GCapable = V1GCapable;
-		    this.V2GCapable = V2GCapable;
-	    	this.activeProductionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);		
-			this.activeConsumptionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);
-			if(V2GCapable && this.V2GActive) {
-				this.assetFlowCategory = OL_AssetFlowCategories.V2GPower_kW;
-			} else {
-				this.assetFlowCategory = OL_AssetFlowCategories.evChargingPower_kW;
-			}
-			this.nbSockets = nbSockets;
-			this.currentChargingSessions = new J_ChargingSession[nbSockets];
-			this.nextSessionIdxs = new int[nbSockets];
-			this.registerEnergyAsset();
-	    }
-	    
-	    public void f_updateAllFlows( double t_h) {
-
-	    	double currentElectricityPriceConsumption_eurpkWh = ((GridConnection)parentAgent).energyModel.pp_dayAheadElectricityPricing_eurpMWh.getCurrentValue() * 0.001;	    	
-	    	this.electricityPriceLowPassed_eurpkWh += (currentElectricityPriceConsumption_eurpkWh-electricityPriceLowPassed_eurpkWh) / (priceFilterTimeScale_h/timestep_h);
-
-	    	/*if (gridAwareMode) { // Add gridload-factor to current price
-	    		currentElectricityPriceConsumption_eurpkWh = currentElectricityPriceConsumption_eurpkWh + (max(0,((GridConnection)parentAgent).p_parentNodeElectric.v_currentLoad_kW/((GridConnection)parentAgent).p_parentNodeElectric.p_capacity_kW-0.5))*0.1;
-	    		if ( ((GridConnection)parentAgent).p_parentNodeElectric.v_currentLoad_kW/((GridConnection)parentAgent).p_parentNodeElectric.p_capacity_kW > 0.5) {
-	    			//traceln("Adding %s eurpkWh to charging price to prevent congestion", (((GridConnection)parentAgent).p_parentNodeElectric.v_currentLoad_kW/((GridConnection)parentAgent).p_parentNodeElectric.p_capacity_kW-0.5)*1);
-	    		}
-	    	}*/
-	    
-	    	// Check if V2G is activated and the charger is capable
-	    	boolean doV2G = this.V2GActive && this.V2GCapable;
-	    	
-	    	// Update the J_ChargingSessions of the sockets
-			for (int i = 0; i<this.nbSockets; i++) {				
-				this.manageSocket(i, t_h); // Should also 'remove' finished sessions.
-			}
-	    	
-			// Calculate the power output of the sockets
-			double power_kW = 0.0;
-			currentNumberOfChargingSockets = 0;
-			
-			for (int i = 0; i<this.nbSockets; i++) {				
-				if (currentChargingSessions[i] != null && t_h >= currentChargingSessions[i].startTime_h) {
-					power_kW += this.operateChargerSocket(i, t_h, currentElectricityPriceConsumption_eurpkWh, doV2G);
-					discharged_kWh += min(0,-power_kW) * timestep_h;
-					charged_kWh += max(0,power_kW) * timestep_h;
-					currentNumberOfChargingSockets++;
-				}
-			}
-			
-			// Call the regular J_EA updateAllFlows and operate
-			this.v_powerFraction_fr = power_kW / this.capacityElectric_kW;
-			super.f_updateAllFlows( );
-	    	return;
-	    }
-	    
-		@Override
-	    public void operate(double ratioOfCapacity) {			
-			
-			double charge_kW = ratioOfCapacity * capacityElectric_kW;
-	    	
-			double electricityProduction_kW = max(-charge_kW, 0);
-			double electricityConsumption_kW = max(charge_kW, 0);
-			
-	    	energyUse_kW = electricityConsumption_kW - electricityProduction_kW;
-	    	energyUsed_kWh += energyUse_kW * timestep_h;
-	    	
-			flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW - electricityProduction_kW);	
-			// Split charging and discharing power 'at the source'!
-			
-			if (charge_kW > 0) { // charging
-				assetFlowsMap.put(OL_AssetFlowCategories.evChargingPower_kW, electricityConsumption_kW);
-			} else if(charge_kW < 0){
-				if(this.V2GCapable) { // && this.V2GActive) {
-					assetFlowsMap.put(OL_AssetFlowCategories.V2GPower_kW, electricityProduction_kW);
-				}
-				else {
-					traceln("Charge power in J_EAChargePoint negative: %s", charge_kW);
-					throw new RuntimeException("Trying to discharge into a charger, that does not have the capability or where v2g is not activated!");
-				}
-			}			
-	   	}
-	    
-		
-		private double operateChargerSocket(int socketNb, double t_h, double currentElectricityPriceConsumption_eurpkWh, boolean doV2G) {
-			double chargeSetpoint_kW = 0;
-			if(!this.V1GCapable) {
-				chargeSetpoint_kW = determineChargeSetpoint_simple_kW(socketNb);
-			}
-			else {
-				switch(this.chargingAttitude) {
-					case SIMPLE:
-						chargeSetpoint_kW = determineChargeSetpoint_simple_kW(socketNb);
-						break;
-					case PRICE:
-						chargeSetpoint_kW = determineChargeSetpoint_price_kW(socketNb, t_h, doV2G, currentElectricityPriceConsumption_eurpkWh);
-						break;
-					case BALANCE_LOCAL:
-						throw new RuntimeException("BALANCE LOCAL CHARGING STRATEGY HAS NOT BEEN CREATED YET FOR CHARGEPOINTS");				
-						//chargeSetpoint_kW = determineChargeSetpoint_balanceLocal_kW(socketNb, t_h, doV2G);
-					case BALANCE_GRID:
-						chargeSetpoint_kW = determineChargeSetpoint_balanceGrid_kW(socketNb, t_h, doV2G);
-						break;
-					default:
-						throw new RuntimeException("UNSUPPORTED CHARGING ATTITUDE SELECTED FOR CHARGEPOINT");
-				}	
-			}
-			
-			return currentChargingSessions[socketNb].charge(chargeSetpoint_kW);
-		}
-		
-		
-		private double determineChargeSetpoint_simple_kW(int socketNb) {
-			double maxChargePower = capacityElectric_kW;//min(currentChargingSessions[socketNb].vehicleMaxChargingPower_kW, capacityElectric_kW);
-			double remainingChargeDemand_kWh = currentChargingSessions[socketNb].getRemainingChargeDemand_kWh(); // Can be negative if recharging is not needed for next trip!
-			double chargeSetpoint_kW = max(0, min(maxChargePower, remainingChargeDemand_kWh/timestep_h));
-			
-			return chargeSetpoint_kW;
-		}
-		
-		private double determineChargeSetpoint_price_kW(int socketNb, double t_h, boolean doV2G, double currentElectricityPriceConsumption_eurpkWh) {
-			double maxChargePower = capacityElectric_kW;//min(currentChargingSessions[socketNb].vehicleMaxChargingPower_kW, capacityElectric_kW);
-			double remainingChargeDemand_kWh = currentChargingSessions[socketNb].getRemainingChargeDemand_kWh(); // Can be negative if recharging is not needed for next trip!
-			double chargeSetpoint_kW = 0;
-
-			//traceln("Smart charging active at chargePoint");
-			double nextTripStartTime_h = currentChargingSessions[socketNb].endTime_h;
-			double chargeTimeMargin_h = 0.5; // Margin to be ready with charging before start of next trip
-			double chargeDeadline_h =  nextTripStartTime_h - remainingChargeDemand_kWh / maxChargePower - chargeTimeMargin_h;
-			double remainingFlexTime_h = chargeDeadline_h - t_h; // measure of flexiblity left in current charging session.
-
-			if ( t_h >= chargeDeadline_h && remainingChargeDemand_kWh > 0) { // Must-charge time at max charging power
-				//traceln("Urgency charging on charge point GC: %s! May exceed connection capacity!", this.parentAgent);
-				chargeSetpoint_kW = min(maxChargePower, remainingChargeDemand_kWh/timestep_h);				
-			} else {
-				double WTPoffset_eurpkW = 0.01; // Drops willingness to pay price for charging, combined with remainingFlexTime_h.
-				double WTPCharging_eurpkWh = electricityPriceLowPassed_eurpkWh - WTPoffset_eurpkW * remainingFlexTime_h;  //+ urgencyGain_eurpkWh * ( max(0,maxSpreadChargingPower_kW) / ev.getCapacityElectric_kW() ); // Scale WTP based on flexibility expressed in terms of power-fraction
-				//WTPprice_eurpkWh = WTPoffset_eurpkWh + (main.v_epexNext24hours_eurpkWh+v_electricityPriceLowPassed_eurpkWh)/2 + flexibilityGain_eurpkWh * sqrt(maxSpreadChargingPower_kW/maxChargingPower_kW); 
-				double priceGain_r = 0.5; // When WTP is higher than current electricity price, ramp up charging power with this gain based on the price-delta.
-				chargeSetpoint_kW = max(0, maxChargePower * min(1,(WTPCharging_eurpkWh / currentElectricityPriceConsumption_eurpkWh - 1) * priceGain_r)); // min(1,...) is needed to prevent devide by zero leading to infinity/NaN results.
-				if ( doV2G && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss SOC and high energy price
-					//traceln("Conditions for V2G met in chargePoint");
-	    			double V2G_WTS_offset_eurpkWh = 0.02; // Price must be at least this amount above the moving average to decide to discharge EV battery.
-					double WTSV2G_eurpkWh = V2G_WTS_offset_eurpkWh + electricityPriceLowPassed_eurpkWh; // Can become zero!!
-					chargeSetpoint_kW = min(0, -maxChargePower * min(1,(currentElectricityPriceConsumption_eurpkWh / WTSV2G_eurpkWh - 1) * priceGain_r)); // min(1,...) is needed to prevent devide by zero leading to infinity/NaN results.
-					//if (chargeSetpoint_kW < 0) {traceln(" V2G Active! Power: " + chargeSetpoint_kW );}
-				}
-			}
-			
-			return chargeSetpoint_kW;
-		}
-		
-		private double determineChargeSetpoint_balanceLocal_kW(int socketNb, double t_h, boolean doV2G) {
-			// DOES NOT MAKE SENSE TO USE THIS FOR GCPUBLIC CHARGER, ONLY FOR GC THAT HAVE THEIR OWN CONSUMPTION -> WHICH SHOULD BE SUPPORTED EVENTUALLY
-			if( parentAgent instanceof GCPublicCharger) {
-				throw new RuntimeException("This strategy only works for GCs that have their own consumption, do not use this for GCPublicChargers");
-			}
-			
-			//CREATE STRATEGY HERE
-			double chargeSetpoint_kW = 0;
-
-			return chargeSetpoint_kW;
-		}	
-		
-		private double determineChargeSetpoint_balanceGrid_kW(int socketNb, double t_h, boolean doV2G) {
-			double chargeSetpoint_kW = 0;
-			double maxChargePower = capacityElectric_kW;
-			double remainingChargeDemand_kWh = currentChargingSessions[socketNb].getRemainingChargeDemand_kWh(); // Can be negative if recharging is not needed for next trip!
-
-			GridNode parentNode = ((GridConnection)parentAgent).p_parentNodeElectric;
-			double currentBalanceOnGridNodeWithoutEV_kW = parentNode.v_currentLoad_kW - parentNode.v_currentChargingPower_kW;
-	    	double gridNodeLowPassedLoad_kW = parentNode.v_lowPassedLoadFilter_kW;
-	    	
-			double nextTripStartTime_h = currentChargingSessions[socketNb].endTime_h;
-			double chargeTimeMargin_h = 0.5; // Margin to be ready with charging before start of next trip
-			double chargeDeadline_h =  nextTripStartTime_h - remainingChargeDemand_kWh / maxChargePower - chargeTimeMargin_h;
-			double remainingFlexTime_h = chargeDeadline_h - t_h; // measure of flexiblity left in current charging session.
-			double remainingTimeToCharge = nextTripStartTime_h - t_h - chargeTimeMargin_h;
-			
-			/*double avgPowerDemandTillTrip_kW = 0;
-			if(remainingTimeToCharge != 0) {
-				avgPowerDemandTillTrip_kW = remainingChargeDemand_kWh / (nextTripStartTime_h - t_h - chargeTimeMargin_h);
-			}
-			else if(remainingChargeDemand_kWh > 0) {
-				avgPowerDemandTillTrip_kW = min(maxChargePower, remainingChargeDemand_kWh/timestep_h);	
-			}*/
-			
-			if ( t_h >= chargeDeadline_h && remainingChargeDemand_kWh > 0) { // Must-charge time at max charging power
-				chargeSetpoint_kW = min(maxChargePower, remainingChargeDemand_kWh/timestep_h);	
-			} else {
-				double flexGain_r_manual = 0.8;
-				double flexGain_r = 1/max(1, (double)parentNode.v_currentNumberOfChargingChargePoints) * flexGain_r_manual; // how strongly to 'follow' currentBalanceBeforeEV_kW -> influenced by the amount of charging chargers at this momment
-				chargeSetpoint_kW = max(0, currentChargingSessions[socketNb].avgPowerDemand_kW + (gridNodeLowPassedLoad_kW - currentBalanceOnGridNodeWithoutEV_kW) * (min(1,flexGain_r)));			    				
-    			if ( doV2G && remainingFlexTime_h > 1 && chargeSetpoint_kW == 0 ) { // Surpluss flexibility
-					chargeSetpoint_kW = min(0, currentChargingSessions[socketNb].avgPowerDemand_kW + (gridNodeLowPassedLoad_kW - currentBalanceOnGridNodeWithoutEV_kW) * (min(1,flexGain_r)));
-				}    
-			}
-			return chargeSetpoint_kW;
-		}
-		
-
-		
-		private void manageSocket(int socketNb, double t_h) {
-			if (this.currentChargingSessions[socketNb] != null && t_h >= this.currentChargingSessions[socketNb].endTime_h) { // end session
-				if (this.currentChargingSessions[socketNb].getRemainingChargeDemand_kWh() > 0.001 ) { traceln("!!Chargesession ended but charge demand not fullfilled!! Remaining demand: %s kWh", this.currentChargingSessions[socketNb].getRemainingChargeDemand_kWh()); }
-				this.currentChargingSessions[socketNb] = null;
-			}
-			
-
-			if ( this.currentChargingSessions[socketNb] == null ) { // socket currently free
-				 // check if we are not already past the last charging session.
-				// Find next charging session on this socket
-				
-				while (this.nextSessionIdxs[socketNb]  < this.chargeSessionList.size() && this.chargeSessionList.get(this.nextSessionIdxs[socketNb]).socketNb != socketNb) {				
-					this.nextSessionIdxs[socketNb]++;
-				}
-				
-				if (this.nextSessionIdxs[socketNb] >= this.chargeSessionList.size()) { // no more sessions available
-					//traceln("Reached end of charging session list!");
-					return;					
-				} else {					
-					this.currentChargingSessions[socketNb] = this.chargeSessionList.get(this.nextSessionIdxs[socketNb]).getClone();
-					
-					if (t_h > this.currentChargingSessions[socketNb].startTime_h) { 
-						traceln("Chargesession %s started %s hours too late!", this.nextSessionIdxs[socketNb], t_h - this.currentChargingSessions[socketNb].startTime_h);	
-						if (t_h >= this.currentChargingSessions[socketNb].endTime_h) { 
-							traceln("!!Chargesession started after its endTime_h!! WTF?");
-						}
-					}
-					this.nextSessionIdxs[socketNb]++;
-				}
-			} 
-		}
-		
-		
-		public void fastForwardCharingSessions(double t_h) {
-			for (int socketNb = 0; socketNb<this.nbSockets; socketNb++) {
-				
-				//Clear current charging session
-				this.currentChargingSessions[socketNb] = null;
-				
-				//Find next charging session that starts after the current time
-				while (this.nextSessionIdxs[socketNb]  < this.chargeSessionList.size() && (this.chargeSessionList.get(this.nextSessionIdxs[socketNb]).socketNb != socketNb || this.chargeSessionList.get(this.nextSessionIdxs[socketNb]).startTime_h <= t_h)) {				
-					this.nextSessionIdxs[socketNb]++;
-				}
-				
-				if (this.nextSessionIdxs[socketNb] >= this.chargeSessionList.size()) { // no more sessions available
-					break;					
-				} else { // Clone upcomming charger session and increase next session index					
-					this.currentChargingSessions[socketNb] = this.chargeSessionList.get(this.nextSessionIdxs[socketNb]).getClone();
-					this.nextSessionIdxs[socketNb]++;
-				}
-			}
-		}
-		
-		
-		public void setV1GCapability(boolean V1GCapable) {
-			this.V1GCapable = V1GCapable;
-		}
-		public void setV2GCapability(boolean V2GCapable) {
-			this.V2GCapable = V2GCapable;
-			this.updateAssetFlowCategory();
-		}
-		public boolean getV1GCapable() {
-			return this.V1GCapable;
-
-		}
-		public boolean getV2GCapable() {
-			return this.V2GCapable;
-
-		}
-		
-		public void setChargingAttitude(OL_ChargingAttitude chargingAttitude) {
-			this.chargingAttitude = chargingAttitude;
-		}
-		
-		public OL_ChargingAttitude getChargingAttitude() {
-			return this.chargingAttitude;
-		}
-		
-		public void setV2GActive(boolean activateV2G) {
-			this.V2GActive = activateV2G;
-			this.updateAssetFlowCategory();
-		}
-		
-		public boolean getV2GActive() {
-			return this.V2GActive;
-		}
-		
-		private void updateAssetFlowCategory() {
-			if(this.V2GCapable && this.V2GActive) {
-				this.assetFlowCategory = OL_AssetFlowCategories.V2GPower_kW;
-			}
-			else {
-				this.assetFlowCategory = OL_AssetFlowCategories.evChargingPower_kW;
-			}
-		}
-		
-		public int getCurrentNumberOfChargingSockets() {
-			return this.currentNumberOfChargingSockets;
-		}
-		
-		@Override
-		public void storeStatesAndReset() {
-	    	energyUsedStored_kWh = energyUsed_kWh;
-	    	energyUsed_kWh = 0.0;
-			dischargedStored_kWh = discharged_kWh;
-			discharged_kWh = 0.0;
-			chargedStored_kWh = charged_kWh;
-			charged_kWh = 0.0;
-			
-			currentChargingSessionsStored = currentChargingSessions.clone();
-			Arrays.fill(currentChargingSessions, null);
-			
-			nextSessionIdxsStored = nextSessionIdxs;
-			nextSessionIdxs = new int[nextSessionIdxsStored.length];
-
-	    	clear();
-		}
-			
-		@Override
-		public void restoreStates() {
-	    	energyUsed_kWh = energyUsedStored_kWh;
-			discharged_kWh = dischargedStored_kWh;
-			charged_kWh = chargedStored_kWh;
-			
-			currentChargingSessions = currentChargingSessionsStored;
-			nextSessionIdxs = nextSessionIdxsStored;
-		}
-		
-
-		@Override
-		public String toString() {
-			return "Power: " + getLastFlows().get(OL_EnergyCarriers.ELECTRICITY) + " kW, capacity: " + capacityElectric_kW + " kW" +
-			", Active charging attitude " + this.chargingAttitude +
-			", Smart charging capable: " + this.V1GCapable +
-			", V2G capable: " + this.V2GCapable +
-			", V2G active: " + this.V2GActive;
-			
-		}
-
-		/**
-		 * This number is here for model snapshot storing purpose<br>
-		 * It needs to be changed when this class gets changed
-		 */ 
-		private static final long serialVersionUID = 1L;
-
-}
diff --git a/_alp/Classes/Class.J_EACharger.java b/_alp/Classes/Class.J_EACharger.java
deleted file mode 100644
index 97acdc3e..00000000
--- a/_alp/Classes/Class.J_EACharger.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * J_EACharger
- */	
-public class J_EACharger extends zero_engine.J_EA implements Serializable {
-		public double discharged_kWh;
-		public double charged_kWh;
-		public double capacityElectric_kW;
-		public List<J_ChargingSession> chargerProfile;
-		public boolean V1GCapable;
-		public boolean V2GCapable;
-		private boolean V2GActive = false;
-		
-		private int currentChargingSessionIndexSocket1;
-		private J_ChargingSession currentChargingSessionSocket1;
-		private int currentChargingSessionIndexSocket2;
-		private J_ChargingSession currentChargingSessionSocket2;
-		
-		private double totalShiftedLoadV1G_kWh;
-		private double totalShiftedLoadV2G_kWh;
-		
-		
-		private double dischargedStored_kWh;
-		private double chargedStored_kWh;
-		private J_ChargingSession currentChargingSessionSocket1Stored;
-		private int currentChargingSessionIndexSocket1Stored;
-		private J_ChargingSession currentChargingSessionSocket2Stored;
-		private int currentChargingSessionIndexSocket2Stored;
-		private double totalShiftedLoadV1GStored_kWh;
-		private double totalShiftedLoadV2GStored_kWh;
-		
-	    /**
-	     * Default constructor
-	     */
-	    public J_EACharger(Agent parentAgent, double electricCapacity_kW, double timestep_h, List<J_ChargingSession> chargerProfile, boolean V1GCapable, boolean V2GCapable) {
-	    	this.parentAgent = parentAgent;
-	    	this.capacityElectric_kW = electricCapacity_kW;
-	    	this.timestep_h = timestep_h;
-	    	this.chargerProfile = chargerProfile;
-		    this.V1GCapable = V1GCapable;
-		    this.V2GCapable = V2GCapable;
-	    	this.activeProductionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);		
-			this.activeConsumptionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);
-			if(V2GCapable && this.V2GActive) {
-				this.assetFlowCategory = OL_AssetFlowCategories.V2GPower_kW;
-			} else {
-				this.assetFlowCategory = OL_AssetFlowCategories.evChargingPower_kW;
-			}
-			this.registerEnergyAsset();
-	    }
-	    
-	    public void f_updateAllFlows( double t_h, boolean doV1G, boolean doV2G) {
-	    	// Powerfraction is calculated below, argument is the current time (energyModel.t_h)
-    	
-	    	// Check if the charger is capable of smart charging
-	    	doV1G = doV1G && this.V1GCapable;
-	    	doV2G = doV2G && this.V2GCapable;
-	    	
-	    	// Update the J_ChargingSessions of the sockets
-			this.manageSocket1();
-			this.manageSocket2();
-	    	
-			// Calculate the power output of the sockets
-			double power_kW = 0.0;
-			int currentTimeInQuarterHours = roundToInt(t_h * 4);
-			if ( this.currentChargingSessionSocket1 != null && currentTimeInQuarterHours >= this.currentChargingSessionSocket1.startTime && currentTimeInQuarterHours < this.currentChargingSessionSocket1.endTime ) {		
-				//null check for currentChargingSessionSocket1 (and 2) is required for end of year when there are no more scheduled sessions
-				power_kW += this.operateChargerSocket1(doV1G, doV2G);
-			}
-			if ( this.currentChargingSessionSocket2 != null && currentTimeInQuarterHours >= this.currentChargingSessionSocket2.startTime && currentTimeInQuarterHours < this.currentChargingSessionSocket2.endTime ) {	
-				power_kW += this.operateChargerSocket2(doV1G, doV2G);
-			}
-			
-			double powerFraction_fr = power_kW / this.capacityElectric_kW;
-			
-			// Call the regular J_EA updateAllFlows and operate
-			super.f_updateAllFlows( powerFraction_fr );
-	    	return;
-	    }
-	    
-	    
-		@Override
-	    public void operate(double ratioOfCapacity) {			
-			double charge_kW = ratioOfCapacity * capacityElectric_kW;
-	    	
-			double electricityProduction_kW = max(-charge_kW, 0);
-			double electricityConsumption_kW = max(charge_kW, 0);
-			
-			discharged_kWh += electricityProduction_kW * timestep_h;
-			charged_kWh += electricityConsumption_kW * timestep_h;
-			
-	    	energyUse_kW = electricityConsumption_kW - electricityProduction_kW;
-	    	energyUsed_kWh += energyUse_kW * timestep_h;
-	    	
-			flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW - electricityProduction_kW);	
-			// Split charging and discharing power 'at the source'!
-
-			assetFlowsMap.put(OL_AssetFlowCategories.evChargingPower_kW, electricityConsumption_kW);
-			if(V2GActive) {
-				assetFlowsMap.put(OL_AssetFlowCategories.V2GPower_kW, electricityProduction_kW);
-			}
-			
-			if (charge_kW > 0) { // charging
-				assetFlowsMap.put(OL_AssetFlowCategories.evChargingPower_kW, electricityConsumption_kW);
-			} else if(charge_kW < 0){
-				if(this.V2GCapable && this.V2GActive) {
-					assetFlowsMap.put(OL_AssetFlowCategories.V2GPower_kW, electricityProduction_kW);
-				}
-				else {
-					throw new RuntimeException("Trying to discharge into a charger, that does not have the capability or where v2g is not activated!");
-				}
-			}
-			
-	   	}
-		
-		private void manageSocket1() {
-			if ( this.currentChargingSessionSocket1 == null ) { // || energyModel.t_h >= v_currentChargingSessionSocket1.endTime / 4.0) {
-				 // check if we are not already past the last charging session
-				if (this.currentChargingSessionIndexSocket1 >= this.chargerProfile.size()) {
-					//v_currentChargingSessionSocket1 = null;
-					return;
-				}
-				while (this.chargerProfile.get(this.currentChargingSessionIndexSocket1).socket != 1) {
-					this.currentChargingSessionIndexSocket1++;
-					if (this.currentChargingSessionIndexSocket1 >= this.chargerProfile.size()) {
-						return;
-					}
-				}
-				this.currentChargingSessionSocket1 = this.chargerProfile.get(this.currentChargingSessionIndexSocket1).getClone();
-				this.currentChargingSessionIndexSocket1++;
-			}
-		}
-		
-		private void manageSocket2() {		
-			if ( this.currentChargingSessionSocket2 == null ) {
-				 // check if we are not already past the last charging session
-				if (this.currentChargingSessionIndexSocket2 >= this.chargerProfile.size()) {
-					return;
-				}
-				while (this.chargerProfile.get(this.currentChargingSessionIndexSocket2).socket != 2) {
-					this.currentChargingSessionIndexSocket2++;
-					if (this.currentChargingSessionIndexSocket2 >= this.chargerProfile.size()) {
-						return;
-					}
-				}
-				this.currentChargingSessionSocket2 = this.chargerProfile.get(this.currentChargingSessionIndexSocket2).getClone();
-				this.currentChargingSessionIndexSocket2++;
-			}
-		}
-
-		private double operateChargerSocket1(boolean doV1G, boolean doV2G) {
-			double chargingPower_kW = this.currentChargingSessionSocket1.operate( doV1G, doV2G );
-			this.totalShiftedLoadV1G_kWh += this.currentChargingSessionSocket1.getShiftedLoadV1GCurrentTimestep();
-			this.totalShiftedLoadV2G_kWh += this.currentChargingSessionSocket1.getShiftedLoadV2GCurrentTimestep();
-			if ( this.currentChargingSessionSocket1.timeStepsToDisconnect == 0 ){
-				this.currentChargingSessionSocket1 = null;
-			}
-			return chargingPower_kW;
-		}
-		
-		private double operateChargerSocket2(boolean doV1G, boolean doV2G) {
-			double chargingPower_kW = this.currentChargingSessionSocket2.operate( doV1G, doV2G );
-			this.totalShiftedLoadV1G_kWh += this.currentChargingSessionSocket2.getShiftedLoadV1GCurrentTimestep();
-			this.totalShiftedLoadV2G_kWh += this.currentChargingSessionSocket2.getShiftedLoadV2GCurrentTimestep();
-			if ( this.currentChargingSessionSocket2.timeStepsToDisconnect == 0 ){
-				this.currentChargingSessionSocket2 = null;
-			}
-			return chargingPower_kW;
-		}
-		
-		@Override
-		public void storeStatesAndReset() {
-	    	energyUsedStored_kWh = energyUsed_kWh;
-	    	energyUsed_kWh = 0.0;
-			dischargedStored_kWh = discharged_kWh;
-			discharged_kWh = 0.0;
-			chargedStored_kWh = charged_kWh;
-			charged_kWh = 0.0;
-			
-			currentChargingSessionSocket1Stored = currentChargingSessionSocket1;
-			currentChargingSessionSocket1 = null;
-			currentChargingSessionIndexSocket1Stored = currentChargingSessionIndexSocket1;
-			currentChargingSessionIndexSocket1 = 0;
-			
-			currentChargingSessionSocket2Stored = currentChargingSessionSocket2;
-			currentChargingSessionSocket2 = null;
-			currentChargingSessionIndexSocket2Stored = currentChargingSessionIndexSocket2;
-			currentChargingSessionIndexSocket2 = 0;
-			
-			totalShiftedLoadV1GStored_kWh = totalShiftedLoadV1G_kWh;
-			totalShiftedLoadV1G_kWh = 0.0;
-			totalShiftedLoadV2GStored_kWh = totalShiftedLoadV2G_kWh;
-			totalShiftedLoadV2G_kWh = 0.0;
-	    	clear();
-		}
-		
-		@Override
-		public void restoreStates() {
-	    	energyUsed_kWh = energyUsedStored_kWh;
-			discharged_kWh = dischargedStored_kWh;
-			charged_kWh = chargedStored_kWh;
-			
-			currentChargingSessionSocket1 = currentChargingSessionSocket1Stored;
-			currentChargingSessionIndexSocket1 = currentChargingSessionIndexSocket1Stored;
-			
-			currentChargingSessionSocket2 = currentChargingSessionSocket2Stored;
-			currentChargingSessionIndexSocket2 = currentChargingSessionIndexSocket2Stored;
-			
-			totalShiftedLoadV1G_kWh = totalShiftedLoadV1GStored_kWh;
-			totalShiftedLoadV2G_kWh = totalShiftedLoadV2GStored_kWh;
-		}
-		
-		public  void setV2GActive(boolean activateV2G) {
-			this.V2GActive = activateV2G;
-			if(this.V2GCapable && activateV2G) {
-				this.assetFlowCategory = OL_AssetFlowCategories.V2GPower_kW;
-			}
-			else {
-				this.assetFlowCategory = OL_AssetFlowCategories.evChargingPower_kW;
-			}
-		}
-		
-		@Override
-		public String toString() {
-			return "Power: " + getLastFlows().get(OL_EnergyCarriers.ELECTRICITY) + " kW, capacity: " + capacityElectric_kW + " kW" ;
-		}
-
-		/**
-		 * This number is here for model snapshot storing purpose<br>
-		 * It needs to be changed when this class gets changed
-		 */ 
-		private static final long serialVersionUID = 1L;
-
-}
diff --git a/_alp/Classes/Class.J_EAChargingSession.java b/_alp/Classes/Class.J_EAChargingSession.java
new file mode 100644
index 00000000..3a948e00
--- /dev/null
+++ b/_alp/Classes/Class.J_EAChargingSession.java
@@ -0,0 +1,288 @@
+/**
+ * J_EAChargingSession
+ */	
+public class J_EAChargingSession extends zero_engine.J_EA implements I_ChargingRequest {
+	
+	private List<J_ChargingSessionData> chargingSessionDataList;
+	private int socketNb;
+	
+	//Current session information
+	private J_ChargingSessionData currentChargingSessionData;
+	
+	private double currentChargingSessionSOC_kWh = 0;
+	private double currentSessionChargingBalance_kWh = 0;
+	
+	//Next session
+	private int nextSessionIndex = 0;
+	
+	//Vehicle scaling
+	private double vehicleScaling = 1;
+
+	//V2GActive/capability (override) parameters
+	private boolean V2GActive = false;
+	private double V2GCapabilityProbablityOverride = 0;
+	private boolean overrideV2GCapability = false;
+
+	//Monitoring
+	private double totalCharged_kWh = 0;
+	private double totalDischarged_kWh = 0;
+
+	//Stored live sim values
+	private J_ChargingSessionData storedCurrentChargingSessionData;
+	private double storedCurrentChargingSessionSOC_kWh;
+	private double storedCurrentSessionChargingBalance_kWh;
+	private double storedTotalCharged_kWh;
+	private double storedTotalDischarged_kWh;
+	private int storedNextSessionIndex;	
+	
+    /**
+     * Default constructor
+     */
+	public J_EAChargingSession(GridConnection parentGC, List<J_ChargingSessionData> chargingSessionDataList, int socketNb) {
+		this.parentAgent = parentGC;	
+		
+		this.socketNb = socketNb;
+    	this.chargingSessionDataList = chargingSessionDataList;
+    	this.timestep_h = parentGC.energyModel.p_timeStep_h;
+    	
+	    this.activeProductionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);   	
+		this.activeConsumptionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);
+		this.setV2GActive(this.V2GActive);
+		
+		registerEnergyAsset();
+	}
+	
+	@Override
+	public void operate(double ratioOfChargeCapacity_r) {
+    	double chargeSetpoint_kW = ratioOfChargeCapacity_r * this.getVehicleChargingCapacity_kW(); // capped between -1 and 1 does already happen in f_updateAllFlows()!
+    	double chargePower_kW = max(min(chargeSetpoint_kW, (this.getStorageCapacity_kWh() - this.getCurrentSOC_kWh()) / this.timestep_h), -this.getCurrentSOC_kWh() / this.timestep_h); // Limit charge power to stay within SoC 0-100
+    	
+    	//Round to floating point precision
+    	chargePower_kW = roundToDecimal(chargePower_kW, J_GlobalParameters.floatingPointPrecision);
+    	
+    	//Bookkeeping of energy flows
+    	double electricityProduction_kW = max(-chargePower_kW, 0);
+		double electricityConsumption_kW = max(chargePower_kW, 0);
+		this.currentChargingSessionSOC_kWh += chargePower_kW * this.timestep_h;
+		this.currentSessionChargingBalance_kWh += chargePower_kW * this.timestep_h;
+
+		updateChargingHistory( electricityProduction_kW, electricityConsumption_kW );
+
+		//Update the EC flows map
+		flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW - electricityProduction_kW);
+		
+		//Update the assetFlowsMap
+		if (chargePower_kW > 0) { // charging
+			assetFlowsMap.put(OL_AssetFlowCategories.evChargingPower_kW, electricityConsumption_kW);
+		}
+		else if(chargePower_kW < 0){
+			if(this.currentChargingSessionData.getV2GCapable() && this.V2GActive) {
+				assetFlowsMap.put(OL_AssetFlowCategories.V2GPower_kW, electricityProduction_kW);
+			}
+			else {
+				throw new RuntimeException("Trying to discharge a chargingsession, that does not have the capability or where v2g is not activated!");
+			}
+		}
+	}
+	
+
+	
+	public void manageCurrentChargingSession(double t_h, I_ChargePointRegistration chargePointRegistration) {
+		
+		if (this.currentChargingSessionData != null && t_h >= this.currentChargingSessionData.getLeaveTime_h()) { // End session
+			if (this.getRemainingChargeDemand_kWh() > 0.001 ) { traceln("!!Chargesession ended but charge demand not fullfilled!! Remaining demand: %s kWh", this.getRemainingChargeDemand_kWh()); }
+			this.energyUsed_kWh += this.currentSessionChargingBalance_kWh; //Add all netto energy charged to the vehicle as final consumption
+			this.energyUse_kW += this.currentSessionChargingBalance_kWh/this.timestep_h; //Add all netto energy charged to the vehicle as final consumption
+			f_updateAllFlows(0.0); //Call needed to transfer energyUse_kW to add flows
+			this.currentChargingSessionData = null;
+			chargePointRegistration.deregisterChargingRequest(this);
+			this.currentSessionChargingBalance_kWh = 0;
+			this.currentChargingSessionSOC_kWh = 0;
+		}
+		
+
+		if ( this.currentChargingSessionData == null ) { // socket currently free
+			 // check if we are not already past the last charging session.
+			// Find next charging session on this socket
+			
+			
+			while (this.nextSessionIndex < this.chargingSessionDataList.size() && this.chargingSessionDataList.get(nextSessionIndex).getSocketNb() != this.socketNb) {				
+				this.nextSessionIndex++;
+			}  
+			
+			if (this.nextSessionIndex >= this.chargingSessionDataList.size()) { // no more sessions available
+				return;	
+
+			} else {					
+				loadChargingSessionData(this.chargingSessionDataList.get(nextSessionIndex));
+				
+				if (t_h > this.currentChargingSessionData.getStartTime_h()) { 
+					traceln("Chargesession %s started %s hours too late!", this.nextSessionIndex, t_h - this.currentChargingSessionData.getStartTime_h());	
+					if (t_h >= this.currentChargingSessionData.getLeaveTime_h()) { 
+						traceln("!!Chargesession started after its endTime_h!!");
+					}
+				}
+				this.nextSessionIndex++;
+			}
+		} 
+
+		if(this.currentChargingSessionData != null && this.currentChargingSessionData.getStartTime_h() == t_h) {
+			chargePointRegistration.registerChargingRequest(this);
+		}
+	}
+	
+	public void loadChargingSessionData(J_ChargingSessionData chargingSessionData) {
+		this.currentChargingSessionData = chargingSessionData.getClone();
+		if(this.overrideV2GCapability) {
+			this.currentChargingSessionData.overrideV2GCapability(this.overrideV2GCapability, random() < this.V2GCapabilityProbablityOverride);
+		}
+		this.currentChargingSessionSOC_kWh = currentChargingSessionData.getInitialSOC_kWh() * this.vehicleScaling;
+	}
+	
+	//Get current ChargingRequest (interface) information
+	public double getLeaveTime_h() {
+		return this.currentChargingSessionData.getLeaveTime_h();
+	}
+
+	public double getVehicleChargingCapacity_kW() {
+		return this.currentChargingSessionData.getChargingCapacity_kW() * this.vehicleScaling;
+	}
+	
+	public double getCurrentSOC_kWh() {
+		return this.currentChargingSessionSOC_kWh;
+	}
+	
+	public double getStorageCapacity_kWh() {
+		return this.currentChargingSessionData.getStorageCapacity_kWh() * this.vehicleScaling;
+	}
+
+    public double getEnergyNeedForNextTrip_kWh() {
+    	return this.currentChargingSessionData.getEnergyNeededForNextTrip_kWh() * this.vehicleScaling;
+    }
+    
+    public double getRemainingChargeDemand_kWh() {
+        return (this.currentChargingSessionData.getEnergyNeededForNextTrip_kWh() * this.vehicleScaling) - this.currentSessionChargingBalance_kWh;
+    }
+    
+	public double getRemainingAverageChargingDemand_kW(double t_h) {
+		return getLeaveTime_h() > t_h ? getRemainingChargeDemand_kWh() / (getLeaveTime_h() - t_h) : 0;
+	}
+	
+	public double getVehicleScaling_fr() {
+		return this.vehicleScaling;
+	}
+	
+	public boolean getV2GCapable() {
+		return this.currentChargingSessionData.getV2GCapable();
+	}
+	
+	//Availability (If chargingsession is currently active)
+	public boolean getAvailability(double t_h) {
+		return this.currentChargingSessionData != null ? this.currentChargingSessionData.getAvailability(t_h) : false;
+	}
+	
+	//V2G activation and capabilities
+	public void enableV2GCapabilityOverride(boolean enableV2GCapabilityOverride, Double V2GCapabilityProbablityOverride) {
+		this.overrideV2GCapability = enableV2GCapabilityOverride;
+		this.V2GCapabilityProbablityOverride = V2GCapabilityProbablityOverride;
+		setV2GActive(getV2GActive());
+	}
+	
+	protected void setV2GActive(boolean activateV2G) { // Should only be called by the chargingManagement class or J_EAChargingSession during initialization itself. (No such thing as friend class in java, so only can put on protected).
+		this.V2GActive = activateV2G;
+		if((!this.overrideV2GCapability || (this.overrideV2GCapability && this.V2GCapabilityProbablityOverride > 0)) && activateV2G) {
+			this.assetFlowCategory = OL_AssetFlowCategories.V2GPower_kW;
+		}
+		else {
+			this.assetFlowCategory = OL_AssetFlowCategories.evChargingPower_kW;
+		}
+	}
+
+	public boolean getV2GActive() {
+		return this.V2GActive;
+	}
+	
+	
+	//Fast forward charging sessions when GC is unpaused to prevent massive peaks for GCs that are trying to catch up
+	public void fastForwardCharingSessions(double t_h, I_ChargePointRegistration chargePointRegistration) {	
+		
+		//Clear current charging session
+		this.currentChargingSessionData = null;
+		this.currentSessionChargingBalance_kWh = 0;
+		this.currentChargingSessionSOC_kWh = 0;
+		
+		if(chargePointRegistration.isRegistered(this)) {
+			chargePointRegistration.deregisterChargingRequest(this);
+		}
+		
+		//Find next charging session that starts after the current time
+		while (this.nextSessionIndex < this.chargingSessionDataList.size() && (this.chargingSessionDataList.get(this.nextSessionIndex).getSocketNb() != socketNb || this.chargingSessionDataList.get(this.nextSessionIndex).getStartTime_h() <= t_h)) {				
+			this.nextSessionIndex++;
+		}
+		
+		if (this.nextSessionIndex >= this.chargingSessionDataList.size()) { // no more sessions available
+			return;					
+		} else { //Load upcomming charger session and increase next session index					
+			loadChargingSessionData(this.chargingSessionDataList.get(nextSessionIndex));
+			this.nextSessionIndex++;
+		}
+		
+		if(this.currentChargingSessionData != null && this.currentChargingSessionData.getStartTime_h() == t_h) {
+			chargePointRegistration.registerChargingRequest(this);
+		}
+	}
+    
+	
+	public void updateChargingHistory(double electricityProduced_kW, double electricityConsumed_kW) {
+		this.totalCharged_kWh += electricityConsumed_kW * this.timestep_h;
+		this.totalDischarged_kWh += electricityProduced_kW * this.timestep_h;
+	}
+	
+	
+	public double getTotalChargeAmount_kWh() {
+		return this.totalCharged_kWh;
+	}
+	public double getTotalDischargeAmount_kWh() {
+		return this.totalDischarged_kWh;
+	}
+	
+    public void storeStatesAndReset() {
+    	//Store
+    	this.energyUsedStored_kWh = this.energyUsed_kWh;
+    	this.storedCurrentChargingSessionSOC_kWh = this.currentChargingSessionSOC_kWh;
+    	this.storedCurrentSessionChargingBalance_kWh = this.currentSessionChargingBalance_kWh;
+    	this.storedTotalCharged_kWh = totalCharged_kWh;
+    	this.storedTotalDischarged_kWh = totalDischarged_kWh;	
+    	this.storedCurrentChargingSessionData = this.currentChargingSessionData;
+    	this.storedNextSessionIndex = this.nextSessionIndex;
+    	
+    	//Reset
+    	this.energyUsed_kWh = 0.0;
+    	this.currentChargingSessionSOC_kWh = 0;
+    	this.currentSessionChargingBalance_kWh = 0;
+    	this.totalCharged_kWh = 0;
+    	this.totalDischarged_kWh = 0;	
+    	this.currentChargingSessionData = null;
+    	this.nextSessionIndex = 0;
+    	clear();    	
+    }
+    
+    public void restoreStates() {
+    	this.energyUsed_kWh = this.energyUsedStored_kWh;
+    	this.currentChargingSessionSOC_kWh = this.storedCurrentChargingSessionSOC_kWh;
+    	this.currentSessionChargingBalance_kWh = this.storedCurrentSessionChargingBalance_kWh;
+    	this.totalCharged_kWh = this.storedTotalCharged_kWh;
+    	this.totalDischarged_kWh = this.storedTotalDischarged_kWh;	
+    	this.currentChargingSessionData = this.storedCurrentChargingSessionData;
+    	this.nextSessionIndex = this.storedNextSessionIndex;
+    }
+    
+	@Override
+	public String toString() {
+		return "Current session info: chargingCapacity_kW: " + getVehicleChargingCapacity_kW() + 
+				", getEnergyNeedForNextTrip_kWh: " + getEnergyNeedForNextTrip_kWh() +
+				", getCurrentSOC_kWh(): " + getCurrentSOC_kWh() + 
+				", getRemainingChargeDemand_kWh: " + getRemainingChargeDemand_kWh() +
+				", getLeaveTime_h: " + getLeaveTime_h();
+	}
+}
diff --git a/_alp/Classes/Class.J_EADieselVehicle.java b/_alp/Classes/Class.J_EADieselVehicle.java
index f01c92bb..3a334f97 100644
--- a/_alp/Classes/Class.J_EADieselVehicle.java
+++ b/_alp/Classes/Class.J_EADieselVehicle.java
@@ -15,6 +15,9 @@ public J_EADieselVehicle() {
      * Constructor initializing the fields
      */
     public J_EADieselVehicle(Agent ownerAssetAgent, double energyConsumption_kWhpkm, double timestep_h, double vehicleScaling, OL_EnergyAssetType energyAssetType, J_ActivityTrackerTrips tripTracker ) {
+    	this(ownerAssetAgent, energyConsumption_kWhpkm, timestep_h, vehicleScaling, energyAssetType, tripTracker, true );
+    }
+    public J_EADieselVehicle(Agent ownerAssetAgent, double energyConsumption_kWhpkm, double timestep_h, double vehicleScaling, OL_EnergyAssetType energyAssetType, J_ActivityTrackerTrips tripTracker, boolean available ) {
 	    this.parentAgent = ownerAssetAgent;
 	    this.energyConsumption_kWhpkm = energyConsumption_kWhpkm;
 	    /*if (energyAssetType == OL_EnergyAssetType.DIESEL_VAN) {
@@ -23,7 +26,8 @@ public J_EADieselVehicle(Agent ownerAssetAgent, double energyConsumption_kWhpkm,
 	    this.timestep_h = timestep_h;
 	    this.vehicleScaling = vehicleScaling;
 	    this.energyAssetType = energyAssetType; //OL_EnergyAssetType.DIESEL_VEHICLE; // AANPASSING ATE, scheelt code in Interface
-	    this.tripTracker = tripTracker; 
+	    this.tripTracker = tripTracker;
+	    this.available = available;
 	    if (tripTracker != null) {
 	    	tripTracker.Vehicle=this;
 	    }		
diff --git a/_alp/Classes/Class.J_EAEV.java b/_alp/Classes/Class.J_EAEV.java
index 2371b0d4..166e41ea 100644
--- a/_alp/Classes/Class.J_EAEV.java
+++ b/_alp/Classes/Class.J_EAEV.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
 //@JsonTypeName("J_EAEV")
-public class J_EAEV extends J_EAVehicle implements Serializable {
+public class J_EAEV extends J_EAVehicle implements I_ChargingRequest {
  
  
 	public OL_EnergyCarriers storageMedium = OL_EnergyCarriers.ELECTRICITY;
@@ -16,15 +16,14 @@ public class J_EAEV extends J_EAVehicle implements Serializable {
  
 	private boolean V2GCapable = true; // For now default true: Add to constructor, where constructor calls: setV2GCapable(boolean isV2GCapable) to adjust min rato of capacity accordingly
 	private boolean V2GActive = false;
-	private double minimumRatioOfChargeCapacity_r = -1; // If Negative, it also allowes discharging (V2G)
-	
+
 	// Should this be in here?	
 	public double energyNeedForNextTrip_kWh;
 	//public OL_EVChargingNeed chargingNeed;
 	private double energyChargedOutsideModelArea_kWh = 0;
 	private double energyChargedOutsideModelAreaStored_kWh;
-	public double charged_kWh = 0;
-	public double discharged_kWh = 0;
+	private double charged_kWh = 0;
+	private double discharged_kWh = 0;
     /**
      * Default constructor
      */
@@ -35,6 +34,10 @@ public J_EAEV() {
      * Constructor initializing the fields
      */
     public J_EAEV(Agent parentAgent, double capacityElectricity_kW, double storageCapacity_kWh, double stateOfCharge_fr, double timestep_h, double energyConsumption_kWhpkm, double vehicleScaling, OL_EnergyAssetType energyAssetType, J_ActivityTrackerTrips tripTracker) {
+    	this(parentAgent, capacityElectricity_kW, storageCapacity_kWh, stateOfCharge_fr, timestep_h, energyConsumption_kWhpkm, vehicleScaling, energyAssetType, tripTracker, true);
+    }
+    
+    public J_EAEV(Agent parentAgent, double capacityElectricity_kW, double storageCapacity_kWh, double stateOfCharge_fr, double timestep_h, double energyConsumption_kWhpkm, double vehicleScaling, OL_EnergyAssetType energyAssetType, J_ActivityTrackerTrips tripTracker, boolean available) {    
 		this.parentAgent = parentAgent;
 		this.capacityElectric_kW = capacityElectricity_kW; // for EV, this is max charging power.
 		this.storageCapacity_kWh = storageCapacity_kWh;
@@ -43,8 +46,9 @@ public J_EAEV(Agent parentAgent, double capacityElectricity_kW, double storageCa
 		this.timestep_h = timestep_h;
 		this.energyConsumption_kWhpkm = energyConsumption_kWhpkm;
 		this.vehicleScaling = vehicleScaling;
-	    this.energyAssetType = energyAssetType; //OL_EnergyAssetType.ELECTRIC_VEHICLE; // AANPASSING ATE: VRAGEN AAN GILLIS: asset type meegeven in functie J_EAV, want scheelt switch statement in iEA functie.
+	    this.energyAssetType = energyAssetType;
 	    this.tripTracker = tripTracker;
+    	this.available = available;
 	    if (tripTracker != null) {
 	    	tripTracker.Vehicle=this;	    	
 	    }
@@ -64,10 +68,10 @@ public J_EAEV(Agent parentAgent, double capacityElectricity_kW, double storageCa
 		
 		registerEnergyAsset();
     }
- 
+    
 	@Override
 	public void operate(double ratioOfChargeCapacity_r) {
-    	double chargeSetpoint_kW = min(1,max(this.minimumRatioOfChargeCapacity_r ,ratioOfChargeCapacity_r)) * (capacityElectric_kW * vehicleScaling); // capped between -1 and 1. (does this already happen in f_updateAllFlows()?
+		double chargeSetpoint_kW = ratioOfChargeCapacity_r * this.capacityElectric_kW * vehicleScaling; // capped between -1 and 1. (does already happen in f_updateAllFlows()!)
     	double chargePower_kW = max(min(chargeSetpoint_kW, (1 - stateOfCharge_fr) * storageCapacity_kWh * vehicleScaling / timestep_h), -stateOfCharge_fr * storageCapacity_kWh * vehicleScaling / timestep_h); // Limit charge power to stay within SoC 0-100
     	
     	//traceln("state of charge: " + stateOfCharge_fr * storageCapacity_kWh + ", charged: " + discharge_kW / 4+ " kWh, charging power kW: " + discharge_kW);
@@ -99,7 +103,12 @@ public void updateStateOfCharge( double power_kW ) {
 			stateOfCharge_fr = 0;
 		}
 	}
- 
+	public void updateChargingHistory(double electricityProduced_kW, double electricityConsumed_kW) {
+		discharged_kWh += electricityProduced_kW * timestep_h;
+		charged_kWh += electricityConsumed_kW * timestep_h;
+	}
+	
+	
 	@Override
 	public boolean startTrip() {
 		if (available) {
@@ -124,49 +133,26 @@ public boolean endTrip(double tripDist_km) {
 			return true;
 		} else {
 			mileage_km += tripDist_km;
-			//traceln( "J_EAEV comes back, trip distance: " + tripDist_km + ", energy consumption: " + tripDist_km * energyConsumption_kWhpkm);
-			//traceln("EV of type: " + this.energyAssetType + "state of charge: " + stateOfCharge_fr);
 			stateOfCharge_fr -= (tripDist_km * vehicleScaling * energyConsumption_kWhpkm) / (storageCapacity_kWh * vehicleScaling);
-			//traceln("storage capacity: " + storageCapacity_kWh + ", state of charge: " + stateOfCharge_fr);
+
 			energyUsed_kWh += tripDist_km * vehicleScaling * energyConsumption_kWhpkm;
 			energyUse_kW += tripDist_km * vehicleScaling * energyConsumption_kWhpkm / timestep_h;
-			//traceln("EV energy use at end of trip: %s kWh", tripDist_km * vehicleScaling * energyConsumption_kWhpkm );
 			if (stateOfCharge_fr < 0) {
-				//traceln( ownerAsset.date());
-				//traceln( "Trip distance: " + tripDist_km + ", vehicle scaling: " + vehicleScaling + ", energy cons_kWhpkm: " + energyConsumption_kWhpkm );
 				traceln("EV of type: " + this.energyAssetType + " from GC " + this.parentAgent + " arrived home with negative SOC: " + roundToDecimal(100 * stateOfCharge_fr,2) + "%");
-						
-				//energyChargedOutsideModelArea_kWh += -stateOfCharge_fr * storageCapacity_kWh;
-				//traceln("energyChargedOutsideModelArea_kWh: " + energyChargedOutsideModelArea_kWh);
-				//stateOfCharge_fr = 0;
 			}
 			this.available = true;
 			return true;
 		}
 	}
- 
-	public double getChargeDeadline_h() {
-		double chargeNeedForNextTrip_kWh = max(0, this.getEnergyNeedForNextTrip_kWh() - this.getCurrentStateOfCharge_kWh());
-		double chargeTimeMargin_h = 0.5; // Margin to be ready with charging before start of next trip
-		double nextTripStartTime_h = getNextTripStartTime_h();
-		double chargeDeadline_h = nextTripStartTime_h - chargeNeedForNextTrip_kWh / this.capacityElectric_kW - chargeTimeMargin_h;
-		//double chargeDeadline_h = floor((this.tripTracker.v_nextEventStartTime_min / 60 - chargeNeedForNextTrip_kWh / this.getCapacityElectric_kW() / timestep_h) * timestep_h;
-		return chargeDeadline_h;
-	}
 	
-	public double getNextTripStartTime_h() {
-		return this.tripTracker.v_nextEventStartTime_min / 60;
-	}
-	
-	public void updateChargingHistory(double electricityProduced_kW, double electricityConsumed_kW) {
-		discharged_kWh += electricityProduced_kW * timestep_h;
-		charged_kWh += electricityConsumed_kW * timestep_h;
-	}
- 
-	public double getEnergyUsed_kWh() {
-		return this.energyUsed_kWh;
-	}
- 
+	////Charging request (interface) getters for the charging management
+	public double getLeaveTime_h() {
+		return getNextTripStartTime_h();
+	}	
+		public double getNextTripStartTime_h() {
+			return this.tripTracker.v_nextEventStartTime_min / 60;
+		}
+
 	public double getCurrentStateOfCharge_fr() {
     	return this.stateOfCharge_fr;
 	}
@@ -175,48 +161,59 @@ public double getStorageCapacity_kWh() {
 		return this.storageCapacity_kWh * this.vehicleScaling;
 	}
 
-	public double getCurrentStateOfCharge_kWh() {
+	public double getCurrentSOC_kWh() {
 		return this.stateOfCharge_fr * this.getStorageCapacity_kWh();
 	}
 		
-	public double getCapacityElectric_kW() {
+	public double getVehicleChargingCapacity_kW() {
 		return this.capacityElectric_kW * this.vehicleScaling;
 	}
-	public double getTotalChargeAmount_kWh() {
-		return this.charged_kWh;
+
+	public double getEnergyNeedForNextTrip_kWh() {
+		return this.energyNeedForNextTrip_kWh * this.vehicleScaling;
 	}
-	public double getTotalDischargeAmount_kWh() {
-		return this.discharged_kWh;
+	
+	public double getRemainingChargeDemand_kWh() {
+		return max(0, this.getEnergyNeedForNextTrip_kWh() - this.getCurrentSOC_kWh());
 	}
 	
-	public double getEnergyNeedForNextTrip_kWh() {
-		return this.energyNeedForNextTrip_kWh * this.vehicleScaling;
+	public double getRemainingAverageChargingDemand_kW(double t_h) {
+		return getLeaveTime_h() > t_h ? getRemainingChargeDemand_kWh() / (getLeaveTime_h() - t_h) : 0;
 	}
- 
+	
+	////
+	
+	
+	
+	
 	public boolean getAvailability() {
 		return this.available;
 	}
- 
+
 	public double getChargingTimeToFull_MIN() {
 		double chargingTime_min = ceil( 60 * ((storageCapacity_kWh * vehicleScaling) - (storageCapacity_kWh * vehicleScaling) * stateOfCharge_fr) / (capacityElectric_kW * vehicleScaling) ) ;
 		return chargingTime_min;
 	}
  
+	public double getEnergyUsed_kWh() {
+		return this.energyUsed_kWh;
+	}
+	
+	public double getTotalChargeAmount_kWh() {
+		return this.charged_kWh;
+	}
+	public double getTotalDischargeAmount_kWh() {
+		return this.discharged_kWh;
+	}
+	
 	public double getEnergyChargedOutsideModelArea_kWh() {
 		return energyChargedOutsideModelArea_kWh;
 	}
 	
+	//V2G capabilities
 	public void setV2GCapable(boolean isV2GCapable) {
 		this.V2GCapable = isV2GCapable;
-		
 		setV2GActive(getV2GActive());
-		
-		if(isV2GCapable) {
-			minimumRatioOfChargeCapacity_r = -1;
-		}
-		else {
-			minimumRatioOfChargeCapacity_r = 0;
-		}
 	}
 	
 	public boolean getV2GCapable() {
@@ -239,8 +236,6 @@ protected void setV2GActive(boolean activateV2G) { // Should only be called by t
 	
 	@Override
     public void storeStatesAndReset() {
-    	// Each energy asset that has some states should overwrite this function!
-		
     	energyUsedStored_kWh = energyUsed_kWh;
     	energyUsed_kWh = 0.0;
     	stateOfChargeStored_r = stateOfCharge_fr;
@@ -252,13 +247,11 @@ public void storeStatesAndReset() {
     	mileage_km = 0;
     	charged_kWh = 0;
     	discharged_kWh = 0;
-    	//traceln("J_EAEV battery content at start of simulation: %s kWh", this.getCurrentStateOfCharge_kWh() );
     	clear();    	
     }
     
 	@Override
     public void restoreStates() {
-    	// Each energy asset that has some states should overwrite this function!
     	energyUsed_kWh = energyUsedStored_kWh;    	
     	stateOfCharge_fr = stateOfChargeStored_r;
     	available = availableStored;
@@ -275,10 +268,5 @@ public String toString() {
 			"charged_kWh = " + roundToDecimal( charged_kWh, 2 ) + " " +
 			"mileage = " + roundToDecimal( mileage_km, 2 ) + " ";
 	}
-	/**
-	 * This number is here for model snapshot storing purpose<br>
-	 * It needs to be changed when this class gets changed
-	 */
-	private static final long serialVersionUID = 1L;
 }
  
diff --git a/_alp/Classes/Class.J_EAHydrogenVehicle.java b/_alp/Classes/Class.J_EAHydrogenVehicle.java
index ec3249e2..3599d8ae 100644
--- a/_alp/Classes/Class.J_EAHydrogenVehicle.java
+++ b/_alp/Classes/Class.J_EAHydrogenVehicle.java
@@ -15,12 +15,16 @@ public J_EAHydrogenVehicle() {
      * Constructor initializing the fields
      */
     public J_EAHydrogenVehicle(Agent ownerAssetAgent, double energyConsumption_kWhpkm, double timestep_h, double vehicleScaling, OL_EnergyAssetType energyAssetType, J_ActivityTrackerTrips tripTracker) {
+    	this(ownerAssetAgent, energyConsumption_kWhpkm, timestep_h, vehicleScaling, energyAssetType, tripTracker, true);
+    }
+    public J_EAHydrogenVehicle(Agent ownerAssetAgent, double energyConsumption_kWhpkm, double timestep_h, double vehicleScaling, OL_EnergyAssetType energyAssetType, J_ActivityTrackerTrips tripTracker, boolean available) {
 	    this.parentAgent = ownerAssetAgent;
 	    this.energyConsumption_kWhpkm = energyConsumption_kWhpkm;
 	    this.timestep_h = timestep_h;
 	    this.vehicleScaling = vehicleScaling;
 	    this.energyAssetType = energyAssetType;
 	    this.tripTracker = tripTracker;
+	    this.available = available;
 	    if (tripTracker != null) {
 	    	tripTracker.Vehicle=this;	    	
 	    }	
diff --git a/_alp/Classes/Class.J_EAVehicle.java b/_alp/Classes/Class.J_EAVehicle.java
index 0c32a40f..f4295498 100644
--- a/_alp/Classes/Class.J_EAVehicle.java
+++ b/_alp/Classes/Class.J_EAVehicle.java
@@ -10,7 +10,7 @@ public abstract class J_EAVehicle extends J_EA implements Serializable {
 	protected boolean availableStored = true;
 	protected double energyConsumption_kWhpkm;
 	//private MobilityTracker mobilityTracker = null;
-	public double vehicleScaling;
+	protected double vehicleScaling;
 	public double mileage_km = 0;
 	public J_ActivityTrackerTrips tripTracker;
     /**
@@ -48,7 +48,7 @@ public boolean getAvailability() {
 		return available;
 	}
 	
-	public double getVehicleScaling() {
+	public double getVehicleScaling_fr() {
 		return vehicleScaling;
 	}
 	
diff --git a/_alp/Classes/Class.J_GlobalParameters.java b/_alp/Classes/Class.J_GlobalParameters.java
index 199e2ec5..b81fb548 100644
--- a/_alp/Classes/Class.J_GlobalParameters.java
+++ b/_alp/Classes/Class.J_GlobalParameters.java
@@ -3,5 +3,5 @@
  */	
 public abstract class J_GlobalParameters {
 	//public final static double floatingPointErrorMargin = 1e-15;
-	public final static int floatingPointPrecision = 15;
+	public final static int floatingPointPrecision = 10;
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_TimeParameters.java b/_alp/Classes/Class.J_TimeParameters.java
new file mode 100644
index 00000000..1d48b4f6
--- /dev/null
+++ b/_alp/Classes/Class.J_TimeParameters.java
@@ -0,0 +1,172 @@
+/**
+ * J_TimeParameters
+ */	
+public class J_TimeParameters {
+	////Time parameters:
+	private static double timeStep_h = 0.25;
+	
+	private static int startYear = 2024;
+	private static double[] hourOfYearPerMonth;
+	private static int dayOfWeek1jan;
+
+	private static double runStartTime_h;
+	private static double runEndTime_h;
+
+	private static int winterWeekNumber;
+	private static int summerWeekNumber;
+	private static double startOfSummerWeek_h;
+	private static double startOfWinterWeek_h;
+	
+	//IsFinal booleans used to make the parameters artificially final
+	private static boolean timeStep_hIsFinal = false;
+
+	private static boolean startYearIsFinal = false;
+	private static boolean hourOfYearPerMonthIsFinal = false;
+	private static boolean dayOfWeek1janIsFinal = false;
+
+	private static boolean runStartTime_hIsFinal = false;
+	private static boolean runEndTime_hIsFinal = false;
+
+	private static boolean winterWeekNumberIsFinal = false;
+	private static boolean summerWeekNumberIsFinal = false;
+	private static boolean startOfSummerWeek_hIsFinal = false;
+	private static boolean startOfWinterWeek_hIsFinal = false;
+	
+	////Time parameter setters: Can only be called once, after that they are made final.
+	public static void setTimeStep_h(double p_timeStep_h) {
+		if(!timeStep_hIsFinal) {
+			timeStep_h = p_timeStep_h;
+			timeStep_hIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set timeStep_h while it is final!");
+		}
+	}
+	public static void setStartYear(int p_startYear) {
+		if(!startYearIsFinal) {
+			startYear = p_startYear;
+			startYearIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set startYear while it is final!");
+		}
+	}
+	public static void setHourOfYearPerMonth(double[] p_hourOfYearPerMonth) {
+		if(!hourOfYearPerMonthIsFinal) {
+			hourOfYearPerMonth = p_hourOfYearPerMonth;
+			hourOfYearPerMonthIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set hourOfYearPerMonth while it is final!");
+		}
+	}
+	public static void setDayOfWeek1jan(int p_dayOfWeek1jan) {
+		if(!dayOfWeek1janIsFinal) {
+			dayOfWeek1jan = p_dayOfWeek1jan;
+			dayOfWeek1janIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set dayOfWeek1jan while it is final!");
+		}
+	}
+	public static void setRunStartTime_h(double p_runStartTime_h) {
+		if(!runStartTime_hIsFinal) {
+			runStartTime_h = p_runStartTime_h;
+			runStartTime_hIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set runStartTime_h while it is final!");
+		}
+	}
+	public static void setRunEndTime_h(double p_runEndTime_h) {
+		if(!runEndTime_hIsFinal) {
+			runEndTime_h = p_runEndTime_h;
+			runEndTime_hIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set runEndTime_h while it is final!");
+		}
+	}
+	public static void setWinterWeekNumber(int p_winterWeekNumber) {
+		if(!winterWeekNumberIsFinal) {
+			winterWeekNumber = p_winterWeekNumber;
+			winterWeekNumberIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set winterWeekNumber while it is final!");
+		}
+	}
+	public static void setSummerWeekNumber(int p_summerWeekNumber) {
+		if(!summerWeekNumberIsFinal) {
+			summerWeekNumber = p_summerWeekNumber;
+			summerWeekNumberIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set summerWeekNumber while it is final!");
+		}
+	}
+	public static void setStartOfSummerWeek_h(double p_startOfSummerWeek_h) {
+		if(!startOfSummerWeek_hIsFinal) {
+			startOfSummerWeek_h = p_startOfSummerWeek_h;
+			startOfSummerWeek_hIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set startOfSummerWeek_h while it is final!");
+		}
+	}
+	public static void setStartOfWinterWeek_h(double p_startOfWinterWeek_h) {
+		if(!startOfWinterWeek_hIsFinal) {
+			startOfWinterWeek_h = p_startOfWinterWeek_h;
+			startOfWinterWeek_hIsFinal = true;
+		}
+		else {
+			throw new RuntimeException("Trying to set startOfWinterWeek_h while it is final!");
+		}
+	}
+	
+	////Finalize all current values of Time parameters -> After this they can't be adjusted anymore.
+	public static void finalizeTimeParameters() {
+		timeStep_hIsFinal = true;
+		startYearIsFinal = true;
+		hourOfYearPerMonthIsFinal = true;
+		dayOfWeek1janIsFinal = true;
+		runStartTime_hIsFinal = true;
+		runEndTime_hIsFinal = true;
+		winterWeekNumberIsFinal = true;
+		summerWeekNumberIsFinal = true;
+		startOfSummerWeek_hIsFinal = true;
+		startOfWinterWeek_hIsFinal = true;		
+	}
+	
+	////Time Parameter getters
+	public static double getTimeStep_h() {
+	    return timeStep_h;
+	}
+	public static int getStartYear() {
+	    return startYear;
+	}
+	public static double[] getHourOfYearPerMonth() {
+	    return hourOfYearPerMonth;
+	}
+	public static int getDayOfWeek1jan() {
+	    return dayOfWeek1jan;
+	}
+	public static double getRunStartTime_h() {
+	    return runStartTime_h;
+	}
+	public static double getRunEndTime_h() {
+	    return runEndTime_h;
+	}
+	public static int getWinterWeekNumber() {
+	    return winterWeekNumber;
+	}
+	public static int getSummerWeekNumber() {
+	    return summerWeekNumber;
+	}
+	public static double getStartOfSummerWeek_h() {
+	    return startOfSummerWeek_h;
+	}
+	public static double getStartOfWinterWeek_h() {
+	    return startOfWinterWeek_h;
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_TimeVariables.java b/_alp/Classes/Class.J_TimeVariables.java
new file mode 100644
index 00000000..615c1c5e
--- /dev/null
+++ b/_alp/Classes/Class.J_TimeVariables.java
@@ -0,0 +1,67 @@
+/**
+ * J_TimeVariables
+ */	
+public class J_TimeVariables {
+	////Time Variables -> Updated every timestep
+	private static double t_h = 0; //Current energymodel runtime: t_h = 0, corresponds to 'jan 1 0:00' of the start year 
+	private static double t_hourOfDay = 0;
+	private static double timeStepsElapsed = 0;
+
+	private static boolean isDaytime = false;
+	private static boolean isWeekday = false;
+	private static boolean isSummerWeek = false;
+	private static boolean isWinterWeek = false;
+	private static boolean isLastTimeStepOfDay = false;
+	
+	public static void updateTimeVariables(int v_timeStepsElapsed) {
+		timeStepsElapsed = v_timeStepsElapsed;
+		t_h = J_TimeParameters.getRunStartTime_h() + timeStepsElapsed * J_TimeParameters.getTimeStep_h();
+		isDaytime = t_h % 24 > 6 && t_h % 24 < 18;
+		isWeekday = (t_h+(J_TimeParameters.getDayOfWeek1jan()-1)*24) % (24*7) < (24*5);
+		isSummerWeek = (t_h % 8760) >= J_TimeParameters.getStartOfSummerWeek_h() && (t_h % 8760) < J_TimeParameters.getStartOfSummerWeek_h() + 24*7;
+		isWinterWeek = (t_h % 8760) >= J_TimeParameters.getStartOfWinterWeek_h() && (t_h % 8760) < J_TimeParameters.getStartOfWinterWeek_h() + 24*7;
+		isLastTimeStepOfDay = t_h % 24 == (24-J_TimeParameters.getTimeStep_h());
+		t_hourOfDay = t_h % 24; // Assumes modelrun starts at midnight.
+	}
+	
+	public static double getT_h() {
+	    return t_h;
+	}
+
+	public static double getT_hourOfDay() {
+	    return t_hourOfDay;
+	}
+
+	public static double getTimeStepsElapsed() {
+	    return timeStepsElapsed;
+	}
+
+	public static boolean isDaytime() {
+	    return isDaytime;
+	}
+
+	public static boolean isWeekday() {
+	    return isWeekday;
+	}
+
+	public static boolean isSummerWeek() {
+	    return isSummerWeek;
+	}
+
+	public static boolean isWinterWeek() {
+	    return isWinterWeek;
+	}
+
+	public static boolean isLastTimeStepOfDay() {
+	    return isLastTimeStepOfDay;
+	}
+	
+	public static Date getDate(Experiment experiment) {
+		Date startDate = experiment.getEngine().getStartDate();
+		long startDateUnixTime_ms = startDate.getTime();
+		long runtime_ms = (long) (timeStepsElapsed * J_TimeParameters.getTimeStep_h() * 60 * 60 * 1000);
+		Date date = new Date();
+		date.setTime(startDateUnixTime_ms + runtime_ms);
+		return date;
+	}
+}
\ No newline at end of file