Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs
===================================================================
diff -u -r815 -r816
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs	(.../DamPipingSellmeijer4ForcesKernelWrapper.cs)	(revision 815)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs	(.../DamPipingSellmeijer4ForcesKernelWrapper.cs)	(revision 816)
@@ -24,6 +24,7 @@
         /// Prepares the specified dam kernel input.
         /// </summary>
         /// <param name="damKernelInput">The dam kernel input.</param>
+        /// <param name="iterationIndex">The number of the currect iteration</param>
         /// <param name="kernelDataInput">The kernel data input.</param>
         /// <param name="kernelDataOutput">The krenel data output</param>
         /// <returns>
@@ -225,9 +226,11 @@
             var designScenario = damKernelInput.DesignScenario;
             var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
             designResults = new List<DesignResult>();
-            var designResult = new DesignResult(damFailureMechanismeCalculationSpecification, designScenario, soilProfile1D, soilProfile2DName, AnalysisType.NoAdaption);
+            var designResult = new DesignResult(damFailureMechanismeCalculationSpecification, designScenario, soilProfile1D, soilProfile2DName, AnalysisType.NoAdaption)
+            {
+                CalculationResult = damPipingOutput.CalculationResult
+            };
 
-            designResult.CalculationResult = damPipingOutput.CalculationResult;
             var pipingDesignResults = new PipingDesignResults(PipingModelType.Sellmeijer4Forces);
             designResult.PipingDesignResults = pipingDesignResults;
             pipingDesignResults.ResultMessage = resultMessage;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r815 -r816
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 815)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 816)
@@ -45,8 +45,8 @@
     /// <seealso cref="Deltares.DamEngine.Calculators.KernelWrappers.Interfaces.IKernelWrapper" />
     public class DamMacroStabilityOutwardsKernelWrapper : IKernelWrapper
     {
-        private const string DamMacroStabilityFolder = @".\KernelWrappers\DamMacroStability";
-        private const string DGeoStabilityExe = "DGeoStability.exe";
+        private const string damMacroStabilityFolder = @".\KernelWrappers\DamMacroStability";
+        private const string dGeoStabilityExe = "DGeoStability.exe";
 
         /// <summary>
         /// Gets or sets the failure mechanisme paramaters for mstab.
@@ -88,7 +88,7 @@
                 
                 var damMacroStabilityInput = new DamMacroStabilityInput()
                 {
-                    DGeoStabilityExePath = Path.Combine(DamMacroStabilityFolder, DGeoStabilityExe),
+                    DGeoStabilityExePath = Path.Combine(damMacroStabilityFolder, dGeoStabilityExe),
                     DGeoStabilityInputFileName = GetStabilityInputFileName(damKernelInput, iterationIndex),
                     FailureMechanismeParamatersMStab = FailureMechanismeParamatersMStab
                 };
@@ -117,7 +117,7 @@
         /// </returns>
         public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List<LogMessage> messages)
         {
-            var calculator = StabilityCalculator(kernelDataInput);
+            //var calculator = StabilityCalculator(kernelDataInput);
             //ToDo zant calculator has no Validate. 
 //            List<string> kernelMessages = calculator.Validate();
             messages = new List<LogMessage>();
@@ -147,21 +147,25 @@
             var results = calculator.GetResults();
             if (results.Count > 0)
             {
-                var zone1 = new DamMacroStabilityOutput.ResultsSingleZone();
-                zone1.SafetyFactor = results[0].Zone1.SafetyFactor;
-                zone1.CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate;
-                zone1.CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate;
-                zone1.EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate;
-                zone1.ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate;
+                var zone1 = new DamMacroStabilityOutput.ResultsSingleZone
+                {
+                    SafetyFactor = results[0].Zone1.SafetyFactor,
+                    CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate,
+                    CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate,
+                    EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate,
+                    ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate
+                };
                 damMacroStabilityOutput.Zone1Results = zone1;
                 if (results[0].Zone2 != null)
                 {
-                    var zone2 = new DamMacroStabilityOutput.ResultsSingleZone();
-                    zone2.SafetyFactor = results[0].Zone1.SafetyFactor;
-                    zone2.CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate;
-                    zone2.CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate;
-                    zone2.EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate;
-                    zone2.ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate;
+                    var zone2 = new DamMacroStabilityOutput.ResultsSingleZone
+                    {
+                        SafetyFactor = results[0].Zone1.SafetyFactor,
+                        CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate,
+                        CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate,
+                        EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate,
+                        ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate
+                    };
                     damMacroStabilityOutput.Zone2Results = zone2;
                 }
             }
@@ -172,8 +176,7 @@
             const string testFolder = @"..\..\Deltares.DamEngine.Calculators.Tests\Files\MacroStability";
             //            var stabilityProjectFilename = Path.Combine(testFolder, "test.sti");
             // var soilDbName = 
-            var geometryFileName = Path.Combine(testFolder, "DWP_1.sti");
-
+            
             var stabilityProjectFilename = kernelDataInput.DGeoStabilityInputFileName;
             var scenario = damKernelInput.DesignScenario;
             var subSoilScenario = damKernelInput.SubSoilScenario;
@@ -245,16 +248,22 @@
             // TODO: this is just fake data
             string soilProfile2DName = "soilProfile2DName";
             var d = new DamFailureMechanismeCalculationSpecification();
-            var s = new DesignScenario();
-            s.Location = new Location();
+            var s = new DesignScenario
+            {
+                Location = new Location()
+            };
             var p = new SoilProfile1D();
             designResults = new List<DesignResult>();
-            var designResult = new DesignResult(d, s, p, soilProfile2DName, AnalysisType.NoAdaption);
-            designResult.CalculationResult = damMacroStabilityOutput.CalculationResult;
-            var stabilityDesignResults = new StabilityDesignResults();
-            stabilityDesignResults.Zone1SafetyFactor = damMacroStabilityOutput.Zone1Results.SafetyFactor;
-            stabilityDesignResults.LocalZone1EntryPointX = damMacroStabilityOutput.Zone1Results.EntryPointXCoordinate;
-            stabilityDesignResults.LocalZone1ExitPointX = damMacroStabilityOutput.Zone1Results.ExitPointXCoordinate;
+            var designResult = new DesignResult(d, s, p, soilProfile2DName, AnalysisType.NoAdaption)
+            {
+                CalculationResult = damMacroStabilityOutput.CalculationResult
+            };
+            var stabilityDesignResults = new StabilityDesignResults
+            {
+                Zone1SafetyFactor = damMacroStabilityOutput.Zone1Results.SafetyFactor,
+                LocalZone1EntryPointX = damMacroStabilityOutput.Zone1Results.EntryPointXCoordinate,
+                LocalZone1ExitPointX = damMacroStabilityOutput.Zone1Results.ExitPointXCoordinate
+            };
             stabilityDesignResults.SafetyFactor = stabilityDesignResults.Zone1SafetyFactor;
             if (damMacroStabilityOutput.Zone2Results != null)
             {
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs
===================================================================
diff -u -r815 -r816
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs	(.../DamPipingSellmeijerVnkKernelWrapper.cs)	(revision 815)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs	(.../DamPipingSellmeijerVnkKernelWrapper.cs)	(revision 816)
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
 using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
 using Deltares.DamEngine.Data.General.Results;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/IKernelWrapper.cs
===================================================================
diff -u -r815 -r816
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/IKernelWrapper.cs	(.../IKernelWrapper.cs)	(revision 815)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/IKernelWrapper.cs	(.../IKernelWrapper.cs)	(revision 816)
@@ -33,6 +33,7 @@
         /// Result of the prepare
         /// </returns>
         PrepareResult Prepare(DamKernelInput damKernelInput, int iterationIndex, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput);
+        
         /// <summary>
         /// Validates the kernel data input.
         /// </summary>
@@ -43,6 +44,7 @@
         /// Number of errors that prevent a calculation
         /// </returns>
         int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List<LogMessage> messages);
+        
         /// <summary>
         /// Performs a failure mechanism calculation based on the input.
         /// </summary>
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
===================================================================
diff -u -r815 -r816
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 815)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 816)
@@ -27,6 +27,7 @@
         /// Create the kernel input.
         /// </summary>
         /// <param name="damKernelInput">The dam kernel input.</param>
+        /// <param name="iterationIndex">The number of the current iteration.</param>
         /// <param name="kernelDataInput">The kernel data input.</param>
         /// <param name="kernelDataOutput">The kernel data output.</param>
         /// <returns>
@@ -229,10 +230,12 @@
             var designScenario = damKernelInput.DesignScenario;
             var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
             designResults = new List<DesignResult>();
-            var designResult = new DesignResult(damFailureMechanismeCalculationSpecification, 
-                designScenario, soilProfile1D, soilProfile2DName, 
-                DamProjectCalculationSpecification.SelectedAnalysisType);
-            designResult.CalculationResult = damPipingBlighOutput.CalculationResult;
+            var designResult = new DesignResult(damFailureMechanismeCalculationSpecification,
+                                                designScenario, soilProfile1D, soilProfile2DName,
+                                                DamProjectCalculationSpecification.SelectedAnalysisType)
+            {
+                CalculationResult = damPipingBlighOutput.CalculationResult
+            };
             var pipingDesignResults = new PipingDesignResults(PipingModelType.Bligh);
             designResult.PipingDesignResults = pipingDesignResults;
             pipingDesignResults.ResultMessage = resultMessage;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapper.cs
===================================================================
diff -u -r815 -r816
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapper.cs	(.../DamMacroStabilityKernelWrapper.cs)	(revision 815)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapper.cs	(.../DamMacroStabilityKernelWrapper.cs)	(revision 816)
@@ -22,12 +22,9 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Xml.Linq;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
-using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStability.Assemblers;
 using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
 using Deltares.DamEngine.Calculators.Properties;
 using Deltares.DamEngine.Data.Design;
@@ -58,6 +55,7 @@
         /// Prepares the specified dam kernel input.
         /// </summary>
         /// <param name="damKernelInput">The dam kernel input.</param>
+        /// <param name="iterationIndex">The number of the current iteration.</param>
         /// <param name="kernelDataInput">The kernel data input.</param>
         /// <param name="kernelDataOutput">The kernel data output</param>
         /// <returns>
@@ -145,21 +143,25 @@
             var results = calculator.GetResults();
             if (results.Count > 0)
             {
-                var zone1 = new DamMacroStabilityOutput.ResultsSingleZone();
-                zone1.SafetyFactor = results[0].Zone1.SafetyFactor;
-                zone1.CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate;
-                zone1.CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate;
-                zone1.EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate;
-                zone1.ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate;
+                var zone1 = new DamMacroStabilityOutput.ResultsSingleZone
+                {
+                    SafetyFactor = results[0].Zone1.SafetyFactor,
+                    CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate,
+                    CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate,
+                    EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate,
+                    ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate
+                };
                 damMacroStabilityOutput.Zone1Results = zone1;
                 if (results[0].Zone2 != null)
                 {
-                    var zone2 = new DamMacroStabilityOutput.ResultsSingleZone();
-                    zone2.SafetyFactor = results[0].Zone1.SafetyFactor;
-                    zone2.CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate;
-                    zone2.CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate;
-                    zone2.EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate;
-                    zone2.ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate;
+                    var zone2 = new DamMacroStabilityOutput.ResultsSingleZone
+                    {
+                        SafetyFactor = results[0].Zone1.SafetyFactor,
+                        CircleSurfacePointLeftXCoordinate = results[0].Zone1.CircleSurfacePointLeftXCoordinate,
+                        CircleSurfacePointRightXCoordinate = results[0].Zone1.CircleSurfacePointRightXCoordinate,
+                        EntryPointXCoordinate = results[0].Zone1.EntryPointXCoordinate,
+                        ExitPointXCoordinate = results[0].Zone1.ExitPointXCoordinate
+                    };
                     damMacroStabilityOutput.Zone2Results = zone2;
                 }
             }
@@ -170,8 +172,7 @@
             const string testFolder = @"..\..\Deltares.DamEngine.Calculators.Tests\Files\MacroStability";
             //            var stabilityProjectFilename = Path.Combine(testFolder, "test.sti");
             // var soilDbName = 
-            var geometryFileName = Path.Combine(testFolder, "DWP_1.sti");
-
+            
             var stabilityProjectFilename = kernelDataInput.DGeoStabilityInputFileName;
             var scenario = damKernelInput.DesignScenario;
             var subSoilScenario = damKernelInput.SubSoilScenario;
@@ -243,16 +244,20 @@
             // TODO: this is just fake data
             string soilProfile2DName = "soilProfile2DName";
             var d = new DamFailureMechanismeCalculationSpecification();
-            var s = new DesignScenario();
-            s.Location = new Location();
+            var s = new DesignScenario
+            {
+                Location = new Location()
+            };
             var p = new SoilProfile1D();
             designResults = new List<DesignResult>();
             var designResult = new DesignResult(d, s, p, soilProfile2DName, AnalysisType.NoAdaption);
 
-            var stabilityDesignResults = new StabilityDesignResults();
-            stabilityDesignResults.Zone1SafetyFactor = damPipingOutput.Zone1Results.SafetyFactor;
-            stabilityDesignResults.LocalZone1EntryPointX = damPipingOutput.Zone1Results.EntryPointXCoordinate;
-            stabilityDesignResults.LocalZone1ExitPointX = damPipingOutput.Zone1Results.ExitPointXCoordinate;
+            var stabilityDesignResults = new StabilityDesignResults
+            {
+                Zone1SafetyFactor = damPipingOutput.Zone1Results.SafetyFactor,
+                LocalZone1EntryPointX = damPipingOutput.Zone1Results.EntryPointXCoordinate,
+                LocalZone1ExitPointX = damPipingOutput.Zone1Results.ExitPointXCoordinate
+            };
             stabilityDesignResults.SafetyFactor = stabilityDesignResults.Zone1SafetyFactor;
             if (damPipingOutput.Zone2Results != null)
             {