Index: vhUnitTest/APPS/Halux/Planning/impl/BatchResetter/ResetBatch/Test.cls.xml
===================================================================
diff -u -r29059 -r31264
--- vhUnitTest/APPS/Halux/Planning/impl/BatchResetter/ResetBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/Halux/Planning/impl/BatchResetter/ResetBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 31264)
@@ -13,8 +13,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="BatchStarterMock">
-<Type>vhTest.Mock.APPS.Halux.Planning.BatchStarter</Type>
+<Property name="BatchServiceMock">
+<Type>vhTest.Mock.APPS.Halux.Planning.BatchService</Type>
 <Private>1</Private>
 </Property>
 
@@ -28,12 +28,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="BatchBewaarderMock">
+<Type>vhTest.Mock.APPS.Halux.Planning.BatchBewaarder</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Set ..BatchMock = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Set ..BatchStarterMock = ##class(vhTest.Mock.APPS.Halux.Planning.BatchStarter).%New()
+	Set ..BatchServiceMock = ##class(vhTest.Mock.APPS.Halux.Planning.BatchService).%New()
 	Set ..BatchSequentieVerwijderaarMock = ##class(vhTest.Mock.APPS.Halux.Planning.BatchSequentieVerwijderaar).%New()
+	Set ..BatchBewaarderMock = ##class(vhTest.Mock.APPS.Halux.Planning.BatchBewaarder).%New()
 	Set ..EventRaiserSpy = ##class(vhTest.Spy.TECH.PubSub.EventRaiser).PushedInstance()
 	Set ..BatchID = $$$DummyInteger
 
@@ -47,15 +53,17 @@
 	Do ..BatchMock.IndienMethodCall("GeefStatus").DanReturn(##class(APPS.Halux.common.enu.BatchStatus).Gestart())
 	Do ..BatchMock.VerwachtMethodCall("ZetStatus", ##class(APPS.Halux.common.enu.BatchStatus).Gecontroleerd())	
 	Do ..BatchMock.IndienMethodCall("GeefID").DanReturn(..BatchID)
-	Do ..BatchStarterMock.VerwachtMethodCall("StartBatch", ..BatchMock)
+	Do ..BatchServiceMock.VerwachtMethodCall("StartBatch", ..BatchID).DanDoeNiks()
 	Do ..BatchSequentieVerwijderaarMock.VerwachtMethodCall("VerwijderBatchSequentie", ..BatchMock)
+	Do ..BatchBewaarderMock.VerwachtMethodCall("BewaarBatch", ..BatchMock)
 	
 	;act
-	Set BatchResetter = ##class(APPS.Halux.Planning.impl.BatchResetter).%New(..BatchStarterMock,..BatchSequentieVerwijderaarMock)
+	Set BatchResetter = ##class(APPS.Halux.Planning.impl.BatchResetter).%New(..BatchServiceMock,..BatchSequentieVerwijderaarMock, ..BatchBewaarderMock)
 	Do BatchResetter.ResetBatch(..BatchMock)
 	
 	;assert
-	Do ..BatchStarterMock.Verifieer()
+	Do ..BatchServiceMock.Verifieer()
+	Do ..BatchBewaarderMock.Verifieer()
 	Do ..BatchMock.Verifieer()
 	Do $$$AssertEquals(..EventRaiserSpy.IsEventGeraised("BatchGeresetEvent"),"")
 	Do ..BatchSequentieVerwijderaarMock.Verifieer()
Index: APPS/Halux/Planning/impl/BatchResetter.cls.xml
===================================================================
diff -u -r29059 -r31264
--- APPS/Halux/Planning/impl/BatchResetter.cls.xml	(.../BatchResetter.cls.xml)	(revision 29059)
+++ APPS/Halux/Planning/impl/BatchResetter.cls.xml	(.../BatchResetter.cls.xml)	(revision 31264)
@@ -8,25 +8,31 @@
 <Private>1</Private>
 </Property>
 
-<Property name="BatchStarter">
-<Type>APPS.Halux.Planning.BatchStarter</Type>
+<Property name="BatchSequentieVerwijderaar">
+<Type>APPS.Halux.Planning.BatchSequentieVerwijderaar</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="BatchSequentieVerwijderaar">
-<Type>APPS.Halux.Planning.BatchSequentieVerwijderaar</Type>
+<Property name="BatchService">
+<Type>APPS.Halux.Planning.BatchService</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="BatchBewaarder">
+<Type>APPS.Halux.Planning.BatchBewaarder</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>BatchStarter:APPS.Halux.Planning.BatchStarter,BatchSequentieVerwijderaar:APPS.Halux.Planning.BatchSequentieVerwijderaar</FormalSpec>
+<FormalSpec>BatchService:APPS.Halux.Planning.BatchService,BatchSequentieVerwijderaar:APPS.Halux.Planning.BatchSequentieVerwijderaar,BatchBewaarder:APPS.Halux.Planning.BatchBewaarder</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..BatchStarter = $$$Implementation(BatchStarter,##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefBatchStarter())
 	set ..BatchSequentieVerwijderaar = $$$Implementation(BatchSequentieVerwijderaar,##class(APPS.Halux.Planning.impl.BatchSequentieVerwijderaar).%New())
+	Set ..BatchService = $$$Implementation(BatchService,##class(APPS.Halux.Planning.impl.BatchService).%New())
+	set ..BatchBewaarder = $$$Implementation(BatchBewaarder,##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefBatchBewaarder())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -36,8 +42,10 @@
 <Implementation><![CDATA[
 	do ..BatchSequentieVerwijderaar.VerwijderBatchSequentie(Batch)
 	do Batch.ZetStatus(##class(APPS.Halux.common.enu.BatchStatus).Gecontroleerd())
-	do ##class(APPS.Halux.common.event.BatchEventRaiser).RaiseBatchGeresetEvent(Batch.GeefID())
-	do ..BatchStarter.StartBatch(Batch)
+	Do ..BatchBewaarder.BewaarBatch(Batch)
+	#dim BatchID As TECH.String = Batch.GeefID()
+	do ##class(APPS.Halux.common.event.BatchEventRaiser).RaiseBatchGeresetEvent(BatchID)
+	Do ..BatchService.StartBatch(BatchID)
 ]]></Implementation>
 </Method>
 </Class>