Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -rde4ebfc961abbbcd502b9932f52c21e315a631c3 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision de4ebfc961abbbcd502b9932f52c21e315a631c3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -23,6 +23,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Utils.Extensions;
 using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.Create.MacroStabilityInwards
 {
@@ -139,7 +140,7 @@
         }
 
         private static void SetLocationInputDailyParametersToEntity(MacroStabilityInwardsCalculationEntity entity,
-                                                                    MacroStabilityInwardsLocationInputDaily inputParameters)
+                                                                    IMacroStabilityInwardsLocationInputDaily inputParameters)
         {
             entity.LocationInputDailyWaterLevelPolder = inputParameters.WaterLevelPolder.ToNaNAsNull();
             entity.LocationInputDailyUseDefaultOffsets = Convert.ToByte(inputParameters.UseDefaultOffsets);
@@ -151,7 +152,7 @@
         }
 
         private static void SetLocationInputExtremeParametersToEntity(MacroStabilityInwardsCalculationEntity entity,
-                                                                      MacroStabilityInwardsLocationInputExtreme inputParameters)
+                                                                      IMacroStabilityInwardsLocationInputExtreme inputParameters)
         {
             entity.LocationInputExtremeWaterLevelPolder = inputParameters.WaterLevelPolder.ToNaNAsNull();
             entity.LocationInputExtremeUseDefaultOffsets = Convert.ToByte(inputParameters.UseDefaultOffsets);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs
===================================================================
diff -u -r33d8b4610b6bc2979e35aa3e23b881a9933e40b5 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensions.cs)	(revision 33d8b4610b6bc2979e35aa3e23b881a9933e40b5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensions.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -171,7 +171,7 @@
             }
         }
 
-        private static void SetLocationInputDailyToInput(MacroStabilityInwardsLocationInputDaily inputDaily,
+        private static void SetLocationInputDailyToInput(IMacroStabilityInwardsLocationInputDaily inputDaily,
                                                          MacroStabilityInwardsCalculationEntity entity)
         {
             inputDaily.WaterLevelPolder = (RoundedDouble) entity.LocationInputDailyWaterLevelPolder.ToNullAsNaN();
@@ -183,7 +183,7 @@
             inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) entity.LocationInputDailyPhreaticLineOffsetDikeToeAtPolder.ToNullAsNaN();
         }
 
-        private static void SetLocationInputExtremeToInput(MacroStabilityInwardsLocationInputExtreme inputExtreme,
+        private static void SetLocationInputExtremeToInput(IMacroStabilityInwardsLocationInputExtreme inputExtreme,
                                                            MacroStabilityInwardsCalculationEntity entity)
         {
             inputExtreme.WaterLevelPolder = (RoundedDouble) entity.LocationInputExtremeWaterLevelPolder.ToNullAsNaN();
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerOneDEntityReadExtensions.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerOneDEntityReadExtensions.cs	(.../MacroStabilityInwardsSoilLayerOneDEntityReadExtensions.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerOneDEntityReadExtensions.cs	(.../MacroStabilityInwardsSoilLayerOneDEntityReadExtensions.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -23,8 +23,8 @@
 using System.Drawing;
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Base.Data;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.Read.MacroStabilityInwards
 {
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -24,8 +24,8 @@
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.Serializers;
 using Core.Common.Base.Data;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.Read.MacroStabilityInwards
 {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer1DCreateExtensionsTest.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer1DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayer1DCreateExtensionsTest.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer1DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayer1DCreateExtensionsTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -26,8 +26,8 @@
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.Test.Create.MacroStabilityInwards
 {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -29,8 +29,8 @@
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.Test.Create.MacroStabilityInwards
 {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs
===================================================================
diff -u -rde4ebfc961abbbcd502b9932f52c21e315a631c3 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationEntityTestHelper.cs)	(revision de4ebfc961abbbcd502b9932f52c21e315a631c3)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationEntityTestHelper.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -25,6 +25,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards
 {
@@ -126,8 +127,8 @@
             Assert.AreEqual(rightGrid.NumberOfVerticalPoints, entity.RightGridNrOfVerticalPoints);
         }
 
-        private static void AssertLocationInputs(MacroStabilityInwardsLocationInputExtreme locationInputExtreme,
-                                                 MacroStabilityInwardsLocationInputDaily locationInputDaily,
+        private static void AssertLocationInputs(IMacroStabilityInwardsLocationInputExtreme locationInputExtreme,
+                                                 IMacroStabilityInwardsLocationInputDaily locationInputDaily,
                                                  MacroStabilityInwardsCalculationEntity entity)
         {
             AssertAreEqual(locationInputExtreme.WaterLevelPolder, entity.LocationInputExtremeWaterLevelPolder);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs
===================================================================
diff -u -r7438751456088ede76933c01627857c4e11681c9 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs	(.../MacroStabilityInwardsInput.cs)	(revision 7438751456088ede76933c01627857c4e11681c9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs	(.../MacroStabilityInwardsInput.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -34,7 +34,7 @@
     /// Class that holds all macro stability inwards calculation specific input parameters, i.e. the values
     /// that can differ across various calculations.
     /// </summary>
-    public class MacroStabilityInwardsInput : Observable, ICalculationInput
+    public class MacroStabilityInwardsInput : Observable, ICalculationInput, IMacroStabilityInwardsWaternetInput
     {
         private static readonly Range<int> tangentLineNumberValidityRange = new Range<int>(1, 50);
 
@@ -200,10 +200,7 @@
             }
         }
 
-        /// <summary>
-        /// Gets the profile which contains a 2 dimensional definition of soil layers with properties.
-        /// </summary>
-        public MacroStabilityInwardsSoilProfileUnderSurfaceLine SoilProfileUnderSurfaceLine { get; private set; }
+        public IMacroStabilityInwardsSoilProfileUnderSurfaceLine SoilProfileUnderSurfaceLine { get; private set; }
 
         /// <summary>
         /// Gets the derived waternet calculation output under extreme circumstances.
@@ -561,15 +558,9 @@
             }
         }
 
-        /// <summary>
-        /// Gets the locations input values for extreme conditions.
-        /// </summary>
-        public MacroStabilityInwardsLocationInputExtreme LocationInputExtreme { get; }
+        public IMacroStabilityInwardsLocationInputExtreme LocationInputExtreme { get; }
 
-        /// <summary>
-        /// Gets the locations input values for daily conditions.
-        /// </summary>
-        public MacroStabilityInwardsLocationInputDaily LocationInputDaily { get; }
+        public IMacroStabilityInwardsLocationInputDaily LocationInputDaily { get; }
 
         /// <summary>
         /// Gets or sets whether zones should be created.
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInput.cs
===================================================================
diff -u -r18df5753718d7753b00cc3d40fde1a90a99b87ed -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInput.cs	(.../MacroStabilityInwardsLocationInput.cs)	(revision 18df5753718d7753b00cc3d40fde1a90a99b87ed)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInput.cs	(.../MacroStabilityInwardsLocationInput.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -20,14 +20,15 @@
 // All rights reserved.
 
 using Core.Common.Base.Data;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data
 {
     /// <summary>
     /// Base class that holds all locations input for either daily or 
     /// extreme conditions for the macro stability inwards calculation.
     /// </summary>
-    public abstract class MacroStabilityInwardsLocationInput
+    public abstract class MacroStabilityInwardsLocationInput : IMacroStabilityInwardsLocationInput
     {
         private RoundedDouble waterLevelPolder;
         private RoundedDouble phreaticLineOffsetBelowDikeTopAtRiver;
@@ -50,10 +51,6 @@
             phreaticLineOffsetBelowDikeToeAtPolder = new RoundedDouble(2, double.NaN);
         }
 
-        /// <summary>
-        /// Gets or sets the polder water level.
-        /// [m+NAP]
-        /// </summary>
         public RoundedDouble WaterLevelPolder
         {
             get
@@ -66,15 +63,8 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets whether the default offsets should be used.
-        /// </summary>
         public bool UseDefaultOffsets { get; set; }
 
-        /// <summary>
-        /// Gets or sets the offset of the phreatic line below dike top at river.
-        /// [m]
-        /// </summary>
         public RoundedDouble PhreaticLineOffsetBelowDikeTopAtRiver
         {
             get
@@ -87,10 +77,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the offset of the phreatic line below dike top at polder.
-        /// [m]
-        /// </summary>
         public RoundedDouble PhreaticLineOffsetBelowDikeTopAtPolder
         {
             get
@@ -103,10 +89,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the offset of the phreatic line below shoulder base inside.
-        /// [m]
-        /// </summary>
         public RoundedDouble PhreaticLineOffsetBelowShoulderBaseInside
         {
             get
@@ -119,10 +101,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the offset of the phreatic line below dike toe at polder.
-        /// [m]
-        /// </summary>
         public RoundedDouble PhreaticLineOffsetBelowDikeToeAtPolder
         {
             get
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInputDaily.cs
===================================================================
diff -u -r2986fcc9781597b8251a1c6551ec1453459472cc -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInputDaily.cs	(.../MacroStabilityInwardsLocationInputDaily.cs)	(revision 2986fcc9781597b8251a1c6551ec1453459472cc)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInputDaily.cs	(.../MacroStabilityInwardsLocationInputDaily.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -20,14 +20,15 @@
 // All rights reserved.
 
 using Core.Common.Base.Data;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data
 {
     /// <summary>
     /// Class that holds all locations input daily conditions 
     /// for the macro stability inwards calculation.
     /// </summary>
-    public class MacroStabilityInwardsLocationInputDaily : MacroStabilityInwardsLocationInput
+    public class MacroStabilityInwardsLocationInputDaily : MacroStabilityInwardsLocationInput, IMacroStabilityInwardsLocationInputDaily
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MacroStabilityInwardsLocationInputDaily"/> class.
@@ -37,10 +38,6 @@
             PenetrationLength = new RoundedDouble(2);
         }
 
-        /// <summary>
-        /// Gets the penetration length.
-        /// [m]
-        /// </summary>
         public RoundedDouble PenetrationLength { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInputExtreme.cs
===================================================================
diff -u -ra4daa6d1ccb443d5ab7901f3ac8578dca7064476 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInputExtreme.cs	(.../MacroStabilityInwardsLocationInputExtreme.cs)	(revision a4daa6d1ccb443d5ab7901f3ac8578dca7064476)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsLocationInputExtreme.cs	(.../MacroStabilityInwardsLocationInputExtreme.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -20,14 +20,15 @@
 // All rights reserved.
 
 using Core.Common.Base.Data;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data
 {
     /// <summary>
     /// Base class that holds all locations input for extreme conditions 
     /// for the macro stability inwards calculation.
     /// </summary>
-    public class MacroStabilityInwardsLocationInputExtreme : MacroStabilityInwardsLocationInput
+    public class MacroStabilityInwardsLocationInputExtreme : MacroStabilityInwardsLocationInput, IMacroStabilityInwardsLocationInputExtreme
     {
         private RoundedDouble penetrationLength;
 
@@ -39,10 +40,6 @@
             penetrationLength = new RoundedDouble(2, double.NaN);
         }
 
-        /// <summary>
-        /// Gets or sets the penetration length.
-        /// [m]
-        /// </summary>
         public RoundedDouble PenetrationLength
         {
             get
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs	(.../MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs	(.../MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using Ringtoets.Common.Data.Probabilistics;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data
 {
@@ -30,9 +30,9 @@
     public static class MacroStabilityInwardsSemiProbabilisticDesignVariableFactory
     {
         /// <summary>
-        /// Creates the design variable for <see cref="MacroStabilityInwardsSoilLayerData.AbovePhreaticLevel"/>.
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.AbovePhreaticLevel"/>.
         /// </summary>
-        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetAbovePhreaticLevel(MacroStabilityInwardsSoilLayerData data)
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetAbovePhreaticLevel(IMacroStabilityInwardsSoilLayerData data)
         {
             return new VariationCoefficientLogNormalDistributionDesignVariable(data.AbovePhreaticLevel)
             {
@@ -41,9 +41,9 @@
         }
 
         /// <summary>
-        /// Creates the design variable for <see cref="MacroStabilityInwardsSoilLayerData.BelowPhreaticLevel"/>.
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.BelowPhreaticLevel"/>.
         /// </summary>
-        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetBelowPhreaticLevel(MacroStabilityInwardsSoilLayerData data)
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetBelowPhreaticLevel(IMacroStabilityInwardsSoilLayerData data)
         {
             return new VariationCoefficientLogNormalDistributionDesignVariable(data.BelowPhreaticLevel)
             {
@@ -52,9 +52,9 @@
         }
 
         /// <summary>
-        /// Creates the design variable for <see cref="MacroStabilityInwardsSoilLayerData.Cohesion"/>.
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.Cohesion"/>.
         /// </summary>
-        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetCohesion(MacroStabilityInwardsSoilLayerData data)
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetCohesion(IMacroStabilityInwardsSoilLayerData data)
         {
             return new VariationCoefficientLogNormalDistributionDesignVariable(data.Cohesion)
             {
@@ -63,9 +63,9 @@
         }
 
         /// <summary>
-        /// Creates the design variable for <see cref="MacroStabilityInwardsSoilLayerData.FrictionAngle"/>.
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.FrictionAngle"/>.
         /// </summary>
-        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetFrictionAngle(MacroStabilityInwardsSoilLayerData data)
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetFrictionAngle(IMacroStabilityInwardsSoilLayerData data)
         {
             return new VariationCoefficientLogNormalDistributionDesignVariable(data.FrictionAngle)
             {
@@ -74,9 +74,9 @@
         }
 
         /// <summary>
-        /// Creates the design variable for <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthRatio"/>.
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthRatio"/>.
         /// </summary>
-        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetShearStrengthRatio(MacroStabilityInwardsSoilLayerData data)
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetShearStrengthRatio(IMacroStabilityInwardsSoilLayerData data)
         {
             return new VariationCoefficientLogNormalDistributionDesignVariable(data.ShearStrengthRatio)
             {
@@ -85,9 +85,9 @@
         }
 
         /// <summary>
-        /// Creates the design variable for <see cref="MacroStabilityInwardsSoilLayerData.StrengthIncreaseExponent"/>.
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.StrengthIncreaseExponent"/>.
         /// </summary>
-        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetStrengthIncreaseExponent(MacroStabilityInwardsSoilLayerData data)
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetStrengthIncreaseExponent(IMacroStabilityInwardsSoilLayerData data)
         {
             return new VariationCoefficientLogNormalDistributionDesignVariable(data.StrengthIncreaseExponent)
             {
@@ -96,9 +96,9 @@
         }
 
         /// <summary>
-        /// Creates the design variable for <see cref="MacroStabilityInwardsSoilLayerData.Pop"/>.
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsSoilLayerData.Pop"/>.
         /// </summary>
-        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetPop(MacroStabilityInwardsSoilLayerData data)
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetPop(IMacroStabilityInwardsSoilLayerData data)
         {
             return new VariationCoefficientLogNormalDistributionDesignVariable(data.Pop)
             {
@@ -107,9 +107,9 @@
         }
 
         /// <summary>
-        /// Creates the design variable for <see cref="MacroStabilityInwardsPreconsolidationStress"/>.
+        /// Creates the design variable for <see cref="IMacroStabilityInwardsPreconsolidationStress"/>.
         /// </summary>
-        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetPreconsolidationStress(MacroStabilityInwardsPreconsolidationStress preconsolidationStressUnderSurfaceLine)
+        public static VariationCoefficientDesignVariable<VariationCoefficientLogNormalDistribution> GetPreconsolidationStress(IMacroStabilityInwardsPreconsolidationStress preconsolidationStressUnderSurfaceLine)
         {
             return new VariationCoefficientLogNormalDistributionDesignVariable(preconsolidationStressUnderSurfaceLine.Stress)
             {
Fisheye: Tag 90a9502badff5788374461a1b2179a5dd0e866a2 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsShearStrengthModel.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj
===================================================================
diff -u -r14c118039f313ea66787d8065daad0aa783b731a -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -72,7 +72,6 @@
     <Compile Include="MacroStabilityInwardsSurfaceLineCollection.cs" />
     <Compile Include="SoilProfile\IMacroStabilityInwardsSoilProfile.cs" />
     <Compile Include="SoilProfile\MacroStabilityInwardsPreconsolidationStress.cs" />
-    <Compile Include="MacroStabilityInwardsShearStrengthModel.cs" />
     <Compile Include="SoilProfile\MacroStabilityInwardsSoilLayer1D.cs" />
     <Compile Include="SoilProfile\MacroStabilityInwardsSoilLayer2D.cs" />
     <Compile Include="SoilProfile\MacroStabilityInwardsSoilLayerData.cs" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsPreconsolidationStress.cs
===================================================================
diff -u -r15f9709130561c93bb217e1c7b5ab942be97f958 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsPreconsolidationStress.cs	(.../MacroStabilityInwardsPreconsolidationStress.cs)	(revision 15f9709130561c93bb217e1c7b5ab942be97f958)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsPreconsolidationStress.cs	(.../MacroStabilityInwardsPreconsolidationStress.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -23,14 +23,15 @@
 using Core.Common.Base.Geometry;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.MacroStabilityInwards.Data.Properties;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile
 {
     /// <summary>
     /// This class represents a preconsolidation stress definition that was imported
     /// from D-Soil model.
     /// </summary>
-    public class MacroStabilityInwardsPreconsolidationStress
+    public class MacroStabilityInwardsPreconsolidationStress : IMacroStabilityInwardsPreconsolidationStress
     {
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsPreconsolidationStress"/>.
@@ -62,17 +63,8 @@
             };
         }
 
-        /// <summary>
-        /// Gets the distribution for the preconsolidation stress.
-        /// [kN/m�]
-        /// </summary>
         public VariationCoefficientLogNormalDistribution Stress { get; }
 
-        /// <summary>
-        /// Gets the location of the preconsolidation stress
-        /// [m]
-        /// </summary>
-        /// <remarks>The <see cref="Point2D.Y"/> has the unit [m+NAP]</remarks>
         public Point2D Location { get; }
 
         public override bool Equals(object obj)
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayerData.cs
===================================================================
diff -u -r33b3ee972d9039d09ecbb8f7db037036af5ec786 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayerData.cs	(.../MacroStabilityInwardsSoilLayerData.cs)	(revision 33b3ee972d9039d09ecbb8f7db037036af5ec786)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayerData.cs	(.../MacroStabilityInwardsSoilLayerData.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -23,13 +23,14 @@
 using System.Drawing;
 using Core.Common.Base.Data;
 using Ringtoets.Common.Data.Probabilistics;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile
 {
     /// <summary>
     /// Data of a soil layer.
     /// </summary>
-    public class MacroStabilityInwardsSoilLayerData
+    public class MacroStabilityInwardsSoilLayerData : IMacroStabilityInwardsSoilLayerData
     {
         private readonly VariationCoefficientLogNormalDistribution abovePhreaticLevel;
         private readonly VariationCoefficientLogNormalDistribution belowPhreaticLevel;
@@ -86,15 +87,8 @@
             ShearStrengthModel = MacroStabilityInwardsShearStrengthModel.CPhi;
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the layer is an aquifer.
-        /// </summary>
         public bool IsAquifer { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name of the material that was assigned to the layer.
-        /// </summary>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is <c>null</c>.</exception>
         public string MaterialName
         {
             get
@@ -111,25 +105,12 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the <see cref="Color"/> that was used to represent the layer.
-        /// </summary>
         public Color Color { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to use POP for the layer.
-        /// </summary>
         public bool UsePop { get; set; }
 
-        /// <summary>
-        /// Gets or sets the shear strength model to use for the layer.
-        /// </summary>
         public MacroStabilityInwardsShearStrengthModel ShearStrengthModel { get; set; }
 
-        /// <summary>
-        /// Gets or sets the volumic weight of the layer above the phreatic level.
-        /// [kN/m³]
-        /// </summary>
         public VariationCoefficientLogNormalDistribution AbovePhreaticLevel
         {
             get
@@ -144,10 +125,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the volumic weight of the layer below the phreatic level.
-        /// [kN/m³]
-        /// </summary>
         public VariationCoefficientLogNormalDistribution BelowPhreaticLevel
         {
             get
@@ -162,10 +139,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the cohesion.
-        /// [kN/m³]
-        /// </summary>
         public VariationCoefficientLogNormalDistribution Cohesion
         {
             get
@@ -179,10 +152,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the friction angle.
-        /// [°]
-        /// </summary>
         public VariationCoefficientLogNormalDistribution FrictionAngle
         {
             get
@@ -196,10 +165,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the strength increase component.
-        /// [-]
-        /// </summary>
         public VariationCoefficientLogNormalDistribution StrengthIncreaseExponent
         {
             get
@@ -213,10 +178,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the shear strength ratio.
-        /// [-]
-        /// </summary>
         public VariationCoefficientLogNormalDistribution ShearStrengthRatio
         {
             get
@@ -230,10 +191,6 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the POP.
-        /// [kN/m²]
-        /// </summary>
         public VariationCoefficientLogNormalDistribution Pop
         {
             get
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayerUnderSurfaceLine.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayerUnderSurfaceLine.cs	(.../MacroStabilityInwardsSoilLayerUnderSurfaceLine.cs)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayerUnderSurfaceLine.cs	(.../MacroStabilityInwardsSoilLayerUnderSurfaceLine.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -23,21 +23,22 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Geometry;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile
 {
     /// <summary>
     /// A 2D soil layer that has been adapted by using a surface line.
     /// </summary>
-    public class MacroStabilityInwardsSoilLayerUnderSurfaceLine
+    public class MacroStabilityInwardsSoilLayerUnderSurfaceLine : IMacroStabilityInwardsSoilLayerUnderSurfaceLine
     {
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayerUnderSurfaceLine"/>.
         /// </summary>
         /// <param name="outerRing">The outer ring of the geometry of the soil layer.</param>
         /// <param name="data">The data of the soil layer.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public MacroStabilityInwardsSoilLayerUnderSurfaceLine(Point2D[] outerRing, MacroStabilityInwardsSoilLayerData data)
+        public MacroStabilityInwardsSoilLayerUnderSurfaceLine(Point2D[] outerRing, IMacroStabilityInwardsSoilLayerData data)
             : this(outerRing, Enumerable.Empty<Point2D[]>(), data) {}
 
         /// <summary>
@@ -47,7 +48,7 @@
         /// <param name="holes">The holes of the geometry of the soil layer.</param>
         /// <param name="data">The data of the soil layer.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public MacroStabilityInwardsSoilLayerUnderSurfaceLine(Point2D[] outerRing, IEnumerable<Point2D[]> holes, MacroStabilityInwardsSoilLayerData data)
+        public MacroStabilityInwardsSoilLayerUnderSurfaceLine(Point2D[] outerRing, IEnumerable<Point2D[]> holes, IMacroStabilityInwardsSoilLayerData data)
         {
             if (outerRing == null)
             {
@@ -66,19 +67,10 @@
             Data = data;
         }
 
-        /// <summary>
-        /// Gets the outer ring of the geometry.
-        /// </summary>
         public Point2D[] OuterRing { get; }
 
-        /// <summary>
-        /// Gets the holes of the geometry.
-        /// </summary>
         public IEnumerable<Point2D[]> Holes { get; }
 
-        /// <summary>
-        /// Gets the data of the soil layer.
-        /// </summary>
-        public MacroStabilityInwardsSoilLayerData Data { get; }
+        public IMacroStabilityInwardsSoilLayerData Data { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs
===================================================================
diff -u -rf2838b78c54529e9b15208b44de854f7760e350f -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs)	(revision f2838b78c54529e9b15208b44de854f7760e350f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -21,22 +21,23 @@
 
 using System;
 using System.Collections.Generic;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile
 {
     /// <summary>
     /// A soil profile for which its properties have been adapted using a surface line.
     /// </summary>
-    public class MacroStabilityInwardsSoilProfileUnderSurfaceLine
+    public class MacroStabilityInwardsSoilProfileUnderSurfaceLine : IMacroStabilityInwardsSoilProfileUnderSurfaceLine
     {
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilProfileUnderSurfaceLine"/>.
         /// </summary>
         /// <param name="layers">The layers in the profile.</param>
         /// <param name="preconsolidationStresses">The preconsolidation stresses defined for the profile.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public MacroStabilityInwardsSoilProfileUnderSurfaceLine(IEnumerable<MacroStabilityInwardsSoilLayerUnderSurfaceLine> layers,
-                                                                IEnumerable<MacroStabilityInwardsPreconsolidationStress> preconsolidationStresses)
+        public MacroStabilityInwardsSoilProfileUnderSurfaceLine(IEnumerable<IMacroStabilityInwardsSoilLayerUnderSurfaceLine> layers,
+                                                                IEnumerable<IMacroStabilityInwardsPreconsolidationStress> preconsolidationStresses)
         {
             if (layers == null)
             {
@@ -49,15 +50,9 @@
             Layers = layers;
             PreconsolidationStresses = preconsolidationStresses;
         }
+        
+        public IEnumerable<IMacroStabilityInwardsSoilLayerUnderSurfaceLine> Layers { get; }
 
-        /// <summary>
-        /// Gets the layers in the profile.
-        /// </summary>
-        public IEnumerable<MacroStabilityInwardsSoilLayerUnderSurfaceLine> Layers { get; }
-
-        /// <summary>
-        /// Gets the preconsolidation stresses in the profile.
-        /// </summary>
-        public IEnumerable<MacroStabilityInwardsPreconsolidationStress> PreconsolidationStresses { get; }
+        public IEnumerable<IMacroStabilityInwardsPreconsolidationStress> PreconsolidationStresses { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaterStressesProperties.cs
===================================================================
diff -u -r66af8add6f7cc445cbb5347af02ee69235ec63be -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaterStressesProperties.cs	(.../MacroStabilityInwardsWaterStressesProperties.cs)	(revision 66af8add6f7cc445cbb5347af02ee69235ec63be)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaterStressesProperties.cs	(.../MacroStabilityInwardsWaterStressesProperties.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -256,7 +256,7 @@
         {
             get
             {
-                return new MacroStabilityInwardsLocationExtremeProperties(data.LocationInputExtreme, propertyChangeHandler);
+                return new MacroStabilityInwardsLocationExtremeProperties((MacroStabilityInwardsLocationInputExtreme) data.LocationInputExtreme, propertyChangeHandler);
             }
         }
 
@@ -268,7 +268,7 @@
         {
             get
             {
-                return new MacroStabilityInwardsLocationDailyProperties(data.LocationInputDaily, propertyChangeHandler);
+                return new MacroStabilityInwardsLocationDailyProperties((MacroStabilityInwardsLocationInputDaily) data.LocationInputDaily, propertyChangeHandler);
             }
         }
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs
===================================================================
diff -u -rbe51145e1b013ea9e1353a6b8618bdc6fd855ff8 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs	(.../MacroStabilityInwardsSoilLayerTransformer.cs)	(revision be51145e1b013ea9e1353a6b8618bdc6fd855ff8)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs	(.../MacroStabilityInwardsSoilLayerTransformer.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -30,6 +30,7 @@
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.IO.Properties;
+using Ringtoets.MacroStabilityInwards.Primitives;
 using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
 
 namespace Ringtoets.MacroStabilityInwards.IO.SoilProfiles
@@ -101,13 +102,13 @@
         }
 
         /// <summary>
-        /// Sets the properties of the <see cref="MacroStabilityInwardsSoilLayerData"/>.
+        /// Sets the properties of the <see cref="IMacroStabilityInwardsSoilLayerData"/>.
         /// </summary>
         /// <param name="soilLayer">The soil layer to get the data from.</param>
         /// <param name="data">The data to set the properties upon.</param>
         /// <exception cref="ImportedDataTransformException">Thrown when transformation would not result
         /// in a valid transformed instance.</exception>
-        private static void SetProperties(SoilLayerBase soilLayer, MacroStabilityInwardsSoilLayerData data)
+        private static void SetProperties(SoilLayerBase soilLayer, IMacroStabilityInwardsSoilLayerData data)
         {
             data.ShearStrengthModel = TransformShearStrengthModel(soilLayer.ShearStrengthModel);
             data.UsePop = TransformUsePop(soilLayer.UsePop);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsLocationInput.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsLocationInput.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsLocationInput.cs	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -0,0 +1,67 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base.Data;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// Interface that holds all locations input for either daily or 
+    /// extreme conditions for the macro stability inwards calculation.
+    /// </summary>
+    public interface IMacroStabilityInwardsLocationInput
+    {
+        /// <summary>
+        /// Gets or sets the polder water level.
+        /// [m+NAP]
+        /// </summary>
+        RoundedDouble WaterLevelPolder { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether the default offsets should be used.
+        /// </summary>
+        bool UseDefaultOffsets { get; set; }
+
+        /// <summary>
+        /// Gets or sets the offset of the phreatic line below dike top at river.
+        /// [m]
+        /// </summary>
+        RoundedDouble PhreaticLineOffsetBelowDikeTopAtRiver { get; set; }
+
+        /// <summary>
+        /// Gets or sets the offset of the phreatic line below dike top at polder.
+        /// [m]
+        /// </summary>
+        RoundedDouble PhreaticLineOffsetBelowDikeTopAtPolder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the offset of the phreatic line below shoulder base inside.
+        /// [m]
+        /// </summary>
+        RoundedDouble PhreaticLineOffsetBelowShoulderBaseInside { get; set; }
+
+        /// <summary>
+        /// Gets or sets the offset of the phreatic line below dike toe at polder.
+        /// [m]
+        /// </summary>
+        RoundedDouble PhreaticLineOffsetBelowDikeToeAtPolder { get; set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsLocationInputDaily.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsLocationInputDaily.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsLocationInputDaily.cs	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -0,0 +1,38 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base.Data;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// Interface that holds all locations input daily conditions 
+    /// for the macro stability inwards calculation.
+    /// </summary>
+    public interface IMacroStabilityInwardsLocationInputDaily : IMacroStabilityInwardsLocationInput
+    {
+        /// <summary>
+        /// Gets the penetration length.
+        /// [m]
+        /// </summary>
+        RoundedDouble PenetrationLength { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsLocationInputExtreme.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsLocationInputExtreme.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsLocationInputExtreme.cs	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -0,0 +1,38 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base.Data;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// Interface class that holds all locations input for extreme conditions 
+    /// for the macro stability inwards calculation.
+    /// </summary>
+    public interface IMacroStabilityInwardsLocationInputExtreme : IMacroStabilityInwardsLocationInput
+    {
+        /// <summary>
+        /// Gets or sets the penetration length.
+        /// [m]
+        /// </summary>
+        RoundedDouble PenetrationLength { get; set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsPreconsolidationStress.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsPreconsolidationStress.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsPreconsolidationStress.cs	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base.Geometry;
+using Ringtoets.Common.Data.Probabilistics;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// Interface that represents a preconsolidation stress definition that was imported
+    /// from D-Soil model.
+    /// </summary>
+    public interface IMacroStabilityInwardsPreconsolidationStress
+    {
+        /// <summary>
+        /// Gets the distribution for the preconsolidation stress.
+        /// [kN/m�]
+        /// </summary>
+        VariationCoefficientLogNormalDistribution Stress { get; }
+
+        /// <summary>
+        /// Gets the location of the preconsolidation stress
+        /// [m]
+        /// </summary>
+        /// <remarks>The <see cref="Point2D.Y"/> has the unit [m+NAP]</remarks>
+        Point2D Location { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilLayerData.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilLayerData.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilLayerData.cs	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -0,0 +1,101 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using Ringtoets.Common.Data.Probabilistics;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// Interface for defining the data of a soil layer.
+    /// </summary>
+    public interface IMacroStabilityInwardsSoilLayerData
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the layer is an aquifer.
+        /// </summary>
+        bool IsAquifer { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the material that was assigned to the layer.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is <c>null</c>.</exception>
+        string MaterialName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Color"/> that was used to represent the layer.
+        /// </summary>
+        Color Color { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to use POP for the layer.
+        /// </summary>
+        bool UsePop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the shear strength model to use for the layer.
+        /// </summary>
+        MacroStabilityInwardsShearStrengthModel ShearStrengthModel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the volumic weight of the layer above the phreatic level.
+        /// [kN/m³]
+        /// </summary>
+        VariationCoefficientLogNormalDistribution AbovePhreaticLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the volumic weight of the layer below the phreatic level.
+        /// [kN/m³]
+        /// </summary>
+        VariationCoefficientLogNormalDistribution BelowPhreaticLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the cohesion.
+        /// [kN/m³]
+        /// </summary>
+        VariationCoefficientLogNormalDistribution Cohesion { get; set; }
+
+        /// <summary>
+        /// Gets or sets the friction angle.
+        /// [°]
+        /// </summary>
+        VariationCoefficientLogNormalDistribution FrictionAngle { get; set; }
+
+        /// <summary>
+        /// Gets or sets the strength increase component.
+        /// [-]
+        /// </summary>
+        VariationCoefficientLogNormalDistribution StrengthIncreaseExponent { get; set; }
+
+        /// <summary>
+        /// Gets or sets the shear strength ratio.
+        /// [-]
+        /// </summary>
+        VariationCoefficientLogNormalDistribution ShearStrengthRatio { get; set; }
+
+        /// <summary>
+        /// Gets or sets the POP.
+        /// [kN/m²]
+        /// </summary>
+        VariationCoefficientLogNormalDistribution Pop { get; set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilLayerUnderSurfaceLine.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilLayerUnderSurfaceLine.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilLayerUnderSurfaceLine.cs	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -0,0 +1,47 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Core.Common.Base.Geometry;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// Interface for a 2D soil layer that has been adapted by using a surface line.
+    /// </summary>
+    public interface IMacroStabilityInwardsSoilLayerUnderSurfaceLine
+    {
+        /// <summary>
+        /// Gets the outer ring of the geometry.
+        /// </summary>
+        Point2D[] OuterRing { get; }
+
+        /// <summary>
+        /// Gets the holes of the geometry.
+        /// </summary>
+        IEnumerable<Point2D[]> Holes { get; }
+
+        /// <summary>
+        /// Gets the data of the soil layer.
+        /// </summary>
+        IMacroStabilityInwardsSoilLayerData Data { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -0,0 +1,41 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// Interface for a soil profile for which its properties have been adapted using a surface line.
+    /// </summary>
+    public interface IMacroStabilityInwardsSoilProfileUnderSurfaceLine
+    {
+        /// <summary>
+        /// Gets the layers in the profile.
+        /// </summary>
+        IEnumerable<IMacroStabilityInwardsSoilLayerUnderSurfaceLine> Layers { get; }
+
+        /// <summary>
+        /// Gets the preconsolidation stresses in the profile.
+        /// </summary>
+        IEnumerable<IMacroStabilityInwardsPreconsolidationStress> PreconsolidationStresses { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsWaternetInput.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsWaternetInput.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsWaternetInput.cs	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -0,0 +1,139 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base.Data;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// Interface that holds macro stability inwards calculation specific input parameters for
+    /// a Waternet calculation.
+    /// </summary>
+    public interface IMacroStabilityInwardsWaternetInput
+    {
+        /// <summary>
+        /// Gets the surface line.
+        /// </summary>
+        MacroStabilityInwardsSurfaceLine SurfaceLine { get; }
+
+        /// <summary>
+        /// Gets the outside high water level.
+        /// [m+NAP]
+        /// </summary>
+        RoundedDouble AssessmentLevel { get; }
+
+        /// <summary>
+        /// Gets the profile which contains a 2 dimensional definition of soil layers with properties.
+        /// </summary>
+        IMacroStabilityInwardsSoilProfileUnderSurfaceLine SoilProfileUnderSurfaceLine { get; }
+
+        /// <summary>
+        /// Gets the dike soil scenario.
+        /// </summary>
+        MacroStabilityInwardsDikeSoilScenario DikeSoilScenario { get; }
+
+        /// <summary>
+        /// Gets the average river water level.
+        /// [m+NAP]
+        /// </summary>
+        RoundedDouble WaterLevelRiverAverage { get; }
+
+        /// <summary>
+        /// Gets whether a drainage construction is present.
+        /// </summary>
+        bool DrainageConstructionPresent { get; }
+
+        /// <summary>
+        /// Gets the x coordinate of the drainage construction.
+        /// [m]
+        /// </summary>
+        RoundedDouble XCoordinateDrainageConstruction { get; }
+
+        /// <summary>
+        /// Gets the z coordinate of the drainage construction.
+        /// [m+NAP]
+        /// </summary>
+        RoundedDouble ZCoordinateDrainageConstruction { get; }
+
+        /// <summary>
+        /// Gets the minimum level phreatic line at dike top river.
+        /// [m+NAP]
+        /// </summary>
+        RoundedDouble MinimumLevelPhreaticLineAtDikeTopRiver { get; }
+
+        /// <summary>
+        /// Gets the minimum level phreatic line at dike top polder.
+        /// [m+NAP]
+        /// </summary>
+        RoundedDouble MinimumLevelPhreaticLineAtDikeTopPolder { get; }
+
+        /// <summary>
+        /// Gets whether phreatic line 3 and 4 should be adjusted for Uplift.
+        /// </summary>
+        bool AdjustPhreaticLine3And4ForUplift { get; }
+
+        /// <summary>
+        /// Gets the leakage length outwards of phreatic line 3.
+        /// [m]
+        /// </summary>
+        RoundedDouble LeakageLengthOutwardsPhreaticLine3 { get; }
+
+        /// <summary>
+        /// Gets the leakage length inwards of phreatic line 3.
+        /// [m]
+        /// </summary>
+        RoundedDouble LeakageLengthInwardsPhreaticLine3 { get; }
+
+        /// <summary>
+        /// Gets the leakage length outwards of phreatic line 4.
+        /// [m]
+        /// </summary>
+        RoundedDouble LeakageLengthOutwardsPhreaticLine4 { get; }
+
+        /// <summary>
+        /// Gets the leakage length inwards of phreatic line 4.
+        /// [m]
+        /// </summary>
+        RoundedDouble LeakageLengthInwardsPhreaticLine4 { get; }
+
+        /// <summary>
+        /// Gets the piezometric head of the phreatic line 2 outwards.
+        /// [m+NAP]
+        /// </summary>
+        RoundedDouble PiezometricHeadPhreaticLine2Outwards { get; }
+
+        /// <summary>
+        /// Gets the piezometric head of the phreatic line 2 inwards.
+        /// [m+NAP]
+        /// </summary>
+        RoundedDouble PiezometricHeadPhreaticLine2Inwards { get; }
+
+        /// <summary>
+        /// Gets the locations input values for extreme conditions.
+        /// </summary>
+        IMacroStabilityInwardsLocationInputExtreme LocationInputExtreme { get; }
+
+        /// <summary>
+        /// Gets the locations input values for daily conditions.
+        /// </summary>
+        IMacroStabilityInwardsLocationInputDaily LocationInputDaily { get; }
+    }
+}
\ No newline at end of file
Fisheye: Tag 9f936b0b29f490a024df02345df182133b1c041a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsShearStrengthModel.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj
===================================================================
diff -u -r14c118039f313ea66787d8065daad0aa783b731a -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -36,13 +36,23 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="IMacroStabilityInwardsLocationInput.cs" />
+    <Compile Include="IMacroStabilityInwardsLocationInputDaily.cs" />
+    <Compile Include="IMacroStabilityInwardsLocationInputExtreme.cs" />
+    <Compile Include="IMacroStabilityInwardsWaternetInput.cs" />
+    <Compile Include="IMacroStabilityInwardsPreconsolidationStress.cs" />
+    <Compile Include="IMacroStabilityInwardsSoilLayerData.cs" />
+    <Compile Include="IMacroStabilityInwardsSoilLayerUnderSurfaceLine.cs" />
+    <Compile Include="IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs" />
     <Compile Include="MacroStabilityInwardsDikeSoilScenario.cs" />
     <Compile Include="MacroStabilityInwardsPhreaticLine.cs" />
+    <Compile Include="MacroStabilityInwardsShearStrengthModel.cs" />
     <Compile Include="MacroStabilityInwardsWaternet.cs" />
     <Compile Include="MacroStabilityInwardsWaternetLine.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/PhreaticLineOffsetsConverter.cs
===================================================================
diff -u -r484ac98127f04b1d315c98fdada7bd9f5a004872 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/PhreaticLineOffsetsConverter.cs	(.../PhreaticLineOffsetsConverter.cs)	(revision 484ac98127f04b1d315c98fdada7bd9f5a004872)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/PhreaticLineOffsetsConverter.cs	(.../PhreaticLineOffsetsConverter.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -22,6 +22,7 @@
 using System;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Converters
 {
@@ -39,7 +40,7 @@
         /// <returns>The converted <see cref="PhreaticLineOffsets"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="input"/>
         /// is <c>null</c>.</exception>
-        public static PhreaticLineOffsets Convert(MacroStabilityInwardsLocationInput input)
+        public static PhreaticLineOffsets Convert(IMacroStabilityInwardsLocationInput input)
         {
             if (input == null)
             {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/SoilProfileConverter.cs
===================================================================
diff -u -rf2838b78c54529e9b15208b44de854f7760e350f -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/SoilProfileConverter.cs	(.../SoilProfileConverter.cs)	(revision f2838b78c54529e9b15208b44de854f7760e350f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/SoilProfileConverter.cs	(.../SoilProfileConverter.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -24,32 +24,32 @@
 using System.ComponentModel;
 using System.Linq;
 using Ringtoets.MacroStabilityInwards.Data;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Converters
 {
     /// <summary>
-    /// Converter to convert <see cref="MacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
+    /// Converter to convert <see cref="IMacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
     /// into <see cref="SoilProfile"/>.
     /// </summary>
     internal static class SoilProfileConverter
     {
         /// <summary>
-        /// Converts <see cref="MacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
+        /// Converts <see cref="IMacroStabilityInwardsSoilProfileUnderSurfaceLine"/>
         /// into <see cref="SoilProfile"/>.
         /// </summary>
         /// <param name="soilProfile">The soil profile to convert.</param>
         /// <returns>The converted <see cref="SoilProfile"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="soilProfile"/>
         /// is <c>null</c>.</exception>
         /// <exception cref="InvalidEnumArgumentException">Thrown when 
-        /// <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when 
-        /// <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
         /// is a valid value but unsupported.</exception>
-        public static SoilProfile Convert(MacroStabilityInwardsSoilProfileUnderSurfaceLine soilProfile)
+        public static SoilProfile Convert(IMacroStabilityInwardsSoilProfileUnderSurfaceLine soilProfile)
         {
             if (soilProfile == null)
             {
@@ -63,22 +63,22 @@
         }
 
         /// <summary>
-        /// Converts <see cref="MacroStabilityInwardsSoilLayerData"/>
+        /// Converts <see cref="IMacroStabilityInwardsSoilLayerData"/>
         /// into <see cref="SoilLayer"/>.
         /// </summary>
         /// <param name="layers">The layers to convert.</param>
         /// <returns>The converted <see cref="SoilLayer"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when 
-        /// <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when 
-        /// <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
+        /// <see cref="IMacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
         /// is a valid value but unsupported.</exception>
-        private static IEnumerable<SoilLayer> ConvertLayers(IEnumerable<MacroStabilityInwardsSoilLayerUnderSurfaceLine> layers)
+        private static IEnumerable<SoilLayer> ConvertLayers(IEnumerable<IMacroStabilityInwardsSoilLayerUnderSurfaceLine> layers)
         {
             return layers.Select(l =>
             {
-                MacroStabilityInwardsSoilLayerData data = l.Data;
+                IMacroStabilityInwardsSoilLayerData data = l.Data;
                 return new SoilLayer(l.OuterRing, l.Holes, new SoilLayer.ConstructionProperties
                 {
                     MaterialName = data.MaterialName,
@@ -99,7 +99,7 @@
         }
 
         private static IEnumerable<PreconsolidationStress> ConvertPreconsolidationStresses(
-            IEnumerable<MacroStabilityInwardsPreconsolidationStress> preconsolidationStresses)
+            IEnumerable<IMacroStabilityInwardsPreconsolidationStress> preconsolidationStresses)
         {
             return preconsolidationStresses.Select(ps => new PreconsolidationStress(
                                                        ps.Location,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs
===================================================================
diff -u -r7438751456088ede76933c01627857c4e11681c9 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs	(.../MacroStabilityInwardsInputTest.cs)	(revision 7438751456088ede76933c01627857c4e11681c9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs	(.../MacroStabilityInwardsInputTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -46,6 +46,7 @@
             // Assert
             Assert.IsInstanceOf<Observable>(inputParameters);
             Assert.IsInstanceOf<ICalculationInput>(inputParameters);
+            Assert.IsInstanceOf<IMacroStabilityInwardsWaternetInput>(inputParameters);
 
             Assert.IsNull(inputParameters.SurfaceLine);
             Assert.IsNull(inputParameters.StochasticSoilModel);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsLocationInputDailyTest.cs
===================================================================
diff -u -ra4daa6d1ccb443d5ab7901f3ac8578dca7064476 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsLocationInputDailyTest.cs	(.../MacroStabilityInwardsLocationInputDailyTest.cs)	(revision a4daa6d1ccb443d5ab7901f3ac8578dca7064476)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsLocationInputDailyTest.cs	(.../MacroStabilityInwardsLocationInputDailyTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
@@ -33,6 +34,7 @@
 
             // Assert
             Assert.IsInstanceOf<MacroStabilityInwardsLocationInput>(locationInput);
+            Assert.IsInstanceOf<IMacroStabilityInwardsLocationInputDaily>(locationInput);
 
             Assert.IsTrue(locationInput.UseDefaultOffsets);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsLocationInputExtremeTest.cs
===================================================================
diff -u -ra4daa6d1ccb443d5ab7901f3ac8578dca7064476 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsLocationInputExtremeTest.cs	(.../MacroStabilityInwardsLocationInputExtremeTest.cs)	(revision a4daa6d1ccb443d5ab7901f3ac8578dca7064476)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsLocationInputExtremeTest.cs	(.../MacroStabilityInwardsLocationInputExtremeTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -22,6 +22,7 @@
 using System;
 using Core.Common.Base.Data;
 using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
@@ -35,6 +36,7 @@
 
             // Assert
             Assert.IsInstanceOf<MacroStabilityInwardsLocationInput>(locationInput);
+            Assert.IsInstanceOf<IMacroStabilityInwardsLocationInputExtreme>(locationInput);
 
             Assert.IsTrue(locationInput.UseDefaultOffsets);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsLocationInputTest.cs
===================================================================
diff -u -r18df5753718d7753b00cc3d40fde1a90a99b87ed -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsLocationInputTest.cs	(.../MacroStabilityInwardsLocationInputTest.cs)	(revision 18df5753718d7753b00cc3d40fde1a90a99b87ed)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsLocationInputTest.cs	(.../MacroStabilityInwardsLocationInputTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -22,6 +22,7 @@
 using System;
 using Core.Common.Base.Data;
 using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
@@ -34,6 +35,7 @@
             var locationInput = new TestMacroStabilityInwardsLocationInput();
 
             // Assert
+            Assert.IsInstanceOf<IMacroStabilityInwardsLocationInput>(locationInput);
             Assert.IsTrue(locationInput.UseDefaultOffsets);
 
             Assert.IsNaN(locationInput.PhreaticLineOffsetBelowDikeTopAtRiver);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsShearStrengthModelTest.cs
===================================================================
diff -u -rfaff4cd6fe5f5933babb1123fad2230589aa8f4d -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsShearStrengthModelTest.cs	(.../MacroStabilityInwardsShearStrengthModelTest.cs)	(revision faff4cd6fe5f5933babb1123fad2230589aa8f4d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsShearStrengthModelTest.cs	(.../MacroStabilityInwardsShearStrengthModelTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -21,6 +21,7 @@
 
 using System;
 using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsPreconsolidationStressTest.cs
===================================================================
diff -u -rd2548d8c57adf0df3e06c5e7ceb3eb9086d84cb2 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsPreconsolidationStressTest.cs	(.../MacroStabilityInwardsPreconsolidationStressTest.cs)	(revision d2548d8c57adf0df3e06c5e7ceb3eb9086d84cb2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsPreconsolidationStressTest.cs	(.../MacroStabilityInwardsPreconsolidationStressTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -28,6 +28,7 @@
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test.SoilProfile
 {
@@ -87,6 +88,7 @@
             var stress = new MacroStabilityInwardsPreconsolidationStress(location, distribution);
 
             // Assert
+            Assert.IsInstanceOf<IMacroStabilityInwardsPreconsolidationStress>(stress);
             Assert.AreEqual(location, stress.Location);
 
             DistributionAssert.AreEqual(new VariationCoefficientLogNormalDistribution(2)
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayerDataTest.cs
===================================================================
diff -u -r3faf4e513cd3a662427ce5aed527bb994f740c18 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayerDataTest.cs	(.../MacroStabilityInwardsSoilLayerDataTest.cs)	(revision 3faf4e513cd3a662427ce5aed527bb994f740c18)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayerDataTest.cs	(.../MacroStabilityInwardsSoilLayerDataTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -29,6 +29,7 @@
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test.SoilProfile
 {
@@ -42,6 +43,7 @@
             var data = new MacroStabilityInwardsSoilLayerData();
 
             // Assert
+            Assert.IsInstanceOf<IMacroStabilityInwardsSoilLayerData>(data);
             Assert.IsFalse(data.IsAquifer);
             Assert.IsEmpty(data.MaterialName);
             Assert.AreEqual(Color.Empty, data.Color);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationDailyPropertiesTest.cs
===================================================================
diff -u -rc6719f7c61c39cbeda54d041a604c98cc4a83970 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationDailyPropertiesTest.cs	(.../MacroStabilityInwardsLocationDailyPropertiesTest.cs)	(revision c6719f7c61c39cbeda54d041a604c98cc4a83970)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationDailyPropertiesTest.cs	(.../MacroStabilityInwardsLocationDailyPropertiesTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -138,10 +138,10 @@
         {
             // Given
             var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsLocationInput input = calculationItem.InputParameters.LocationInputDaily;
+            var input = (MacroStabilityInwardsLocationInputDaily) calculationItem.InputParameters.LocationInputDaily;
 
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
-            var properties = new MacroStabilityInwardsLocationDailyProperties(calculationItem.InputParameters.LocationInputDaily, handler);
+            var properties = new MacroStabilityInwardsLocationDailyProperties(input, handler);
 
             var random = new Random();
             double waterLevelPolder = random.Next();
@@ -180,7 +180,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsLocationDailyProperties(input.LocationInputDaily, handler);
+            var properties = new MacroStabilityInwardsLocationDailyProperties((MacroStabilityInwardsLocationInputDaily) input.LocationInputDaily, handler);
 
             // Call
             setProperty(properties);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationExtremePropertiesTest.cs
===================================================================
diff -u -rc6719f7c61c39cbeda54d041a604c98cc4a83970 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationExtremePropertiesTest.cs	(.../MacroStabilityInwardsLocationExtremePropertiesTest.cs)	(revision c6719f7c61c39cbeda54d041a604c98cc4a83970)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationExtremePropertiesTest.cs	(.../MacroStabilityInwardsLocationExtremePropertiesTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -137,10 +137,10 @@
         {
             // Given
             var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsLocationInputExtreme input = calculationItem.InputParameters.LocationInputExtreme;
+            var input = (MacroStabilityInwardsLocationInputExtreme) calculationItem.InputParameters.LocationInputExtreme;
 
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
-            var properties = new MacroStabilityInwardsLocationExtremeProperties(calculationItem.InputParameters.LocationInputExtreme, handler);
+            var properties = new MacroStabilityInwardsLocationExtremeProperties(input, handler);
 
             var random = new Random();
             double waterLevelPolder = random.Next();
@@ -193,7 +193,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsLocationExtremeProperties(input.LocationInputExtreme, handler);
+            var properties = new MacroStabilityInwardsLocationExtremeProperties((MacroStabilityInwardsLocationInputExtreme) input.LocationInputExtreme, handler);
 
             // Call
             setProperty(properties);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationPropertiesTest.cs
===================================================================
diff -u -rc6719f7c61c39cbeda54d041a604c98cc4a83970 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationPropertiesTest.cs	(.../MacroStabilityInwardsLocationPropertiesTest.cs)	(revision c6719f7c61c39cbeda54d041a604c98cc4a83970)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsLocationPropertiesTest.cs	(.../MacroStabilityInwardsLocationPropertiesTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -157,10 +157,10 @@
         {
             // Given
             var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsLocationInput input = calculationItem.InputParameters.LocationInputExtreme;
+            var input = (MacroStabilityInwardsLocationInput) calculationItem.InputParameters.LocationInputExtreme;
 
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
-            var properties = new TestMacroStabilityInwardsLocationProperties(calculationItem.InputParameters.LocationInputExtreme, handler);
+            var properties = new TestMacroStabilityInwardsLocationProperties(input, handler);
 
             var random = new Random();
             double waterLevelPolder = random.Next();
@@ -217,7 +217,7 @@
                 observable
             });
 
-            var properties = new TestMacroStabilityInwardsLocationProperties(input.LocationInputExtreme, handler);
+            var properties = new TestMacroStabilityInwardsLocationProperties((MacroStabilityInwardsLocationInput) input.LocationInputExtreme, handler);
 
             // Call
             setProperty(properties);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs
===================================================================
diff -u -r18df5753718d7753b00cc3d40fde1a90a99b87ed -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs	(.../MacroStabilityInwardsOffsetPropertiesTest.cs)	(revision 18df5753718d7753b00cc3d40fde1a90a99b87ed)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs	(.../MacroStabilityInwardsOffsetPropertiesTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -187,7 +187,7 @@
         {
             // Given
             var calculationItem = new MacroStabilityInwardsCalculationScenario();
-            MacroStabilityInwardsLocationInput input = calculationItem.InputParameters.LocationInputExtreme;
+            var input = (MacroStabilityInwardsLocationInput) calculationItem.InputParameters.LocationInputExtreme;
 
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
             var properties = new MacroStabilityInwardsOffsetProperties(input, handler);
@@ -319,7 +319,7 @@
             observable.Expect(o => o.NotifyObservers());
             mocks.ReplayAll();
 
-            MacroStabilityInwardsLocationInput input = calculation.InputParameters.LocationInputExtreme;
+            var input = (MacroStabilityInwardsLocationInput) calculation.InputParameters.LocationInputExtreme;
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new[]
             {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs
===================================================================
diff -u -re7264aaab63be7a266ae8340fdb9eac7dba28c4e -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs	(.../MacroStabilityInwardsSoilLayerTransformerTest.cs)	(revision e7264aaab63be7a266ae8340fdb9eac7dba28c4e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs	(.../MacroStabilityInwardsSoilLayerTransformerTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -34,6 +34,7 @@
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.IO.SoilProfiles;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.IO.Test.SoilProfiles
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs
===================================================================
diff -u -re343b677ebba0cff9ce37025214aa3109af39a1a -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs)	(revision e343b677ebba0cff9ce37025214aa3109af39a1a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -33,6 +33,7 @@
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.IO.SoilProfiles;
 using Ringtoets.MacroStabilityInwards.IO.TestUtil;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.IO.Test.SoilProfiles
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/SoilProfileConverterTest.cs
===================================================================
diff -u -rf2838b78c54529e9b15208b44de854f7760e350f -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/SoilProfileConverterTest.cs	(.../SoilProfileConverterTest.cs)	(revision f2838b78c54529e9b15208b44de854f7760e350f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/SoilProfileConverterTest.cs	(.../SoilProfileConverterTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -28,9 +28,9 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Probabilistics;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.MacroStabilityInwards.Service.Converters;
 using Ringtoets.MacroStabilityInwards.Service.TestUtil;
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r457252870eff6f6c559976ae2a479112b5754bec -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 457252870eff6f6c559976ae2a479112b5754bec)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -36,6 +36,7 @@
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators;
+using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.MacroStabilityInwards.Service.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Test
@@ -630,7 +631,7 @@
             Assert.AreEqual(originalInput.ZCoordinateDrainageConstruction, actualInput.ZCoordinate);
         }
 
-        private static void AssertPhreaticLineOffsets(MacroStabilityInwardsLocationInput expected, PhreaticLineOffsets actual)
+        private static void AssertPhreaticLineOffsets(IMacroStabilityInwardsLocationInput expected, PhreaticLineOffsets actual)
         {
             Assert.AreEqual(expected.UseDefaultOffsets, actual.UseDefaults);
             Assert.AreEqual(expected.PhreaticLineOffsetBelowDikeTopAtRiver, actual.BelowDikeTopAtRiver);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj
===================================================================
diff -u -r3faf4e513cd3a662427ce5aed527bb994f740c18 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj)	(revision 3faf4e513cd3a662427ce5aed527bb994f740c18)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -75,6 +75,10 @@
       <Project>{3c0d3b38-a9f7-4b22-9705-513da26ae2cc}</Project>
       <Name>Ringtoets.MacroStabilityInwards.KernelWrapper</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.Primitives\Ringtoets.MacroStabilityInwards.Primitives.csproj">
+      <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanCalculatorInputAssert.cs
===================================================================
diff -u -r2f475a02ae31bb68d351db98e3e7e82cb7456291 -r90a9502badff5788374461a1b2179a5dd0e866a2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanCalculatorInputAssert.cs	(.../UpliftVanCalculatorInputAssert.cs)	(revision 2f475a02ae31bb68d351db98e3e7e82cb7456291)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanCalculatorInputAssert.cs	(.../UpliftVanCalculatorInputAssert.cs)	(revision 90a9502badff5788374461a1b2179a5dd0e866a2)
@@ -24,7 +24,7 @@
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Service.TestUtil
 {
@@ -40,12 +40,12 @@
         /// <param name="actual">The actual <see cref="SoilProfile"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// does not correspond to <paramref name="original"/>.</exception>
-        public static void AssertSoilProfile(MacroStabilityInwardsSoilProfileUnderSurfaceLine original, SoilProfile actual)
+        public static void AssertSoilProfile(IMacroStabilityInwardsSoilProfileUnderSurfaceLine original, SoilProfile actual)
         {
-            MacroStabilityInwardsSoilLayerUnderSurfaceLine[] expectedLayers = original.Layers.ToArray();
+            IMacroStabilityInwardsSoilLayerUnderSurfaceLine[] expectedLayers = original.Layers.ToArray();
             SoilLayer[] actualLayers = actual.Layers.ToArray();
 
-            MacroStabilityInwardsPreconsolidationStress[] expectedPreconsolidationStresses = original.PreconsolidationStresses.ToArray();
+            IMacroStabilityInwardsPreconsolidationStress[] expectedPreconsolidationStresses = original.PreconsolidationStresses.ToArray();
             PreconsolidationStress[] actualPreconsolidationStresses = actual.PreconsolidationStresses.ToArray();
 
             AssertLayers(expectedLayers, actualLayers);
@@ -59,7 +59,7 @@
         /// <param name="actual">The actual <see cref="PreconsolidationStress"/> array.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// does not correspond to <paramref name="original"/>.</exception>
-        private static void AssertPreconsolidationStresses(MacroStabilityInwardsPreconsolidationStress[] original,
+        private static void AssertPreconsolidationStresses(IMacroStabilityInwardsPreconsolidationStress[] original,
                                                            PreconsolidationStress[] actual)
         {
             Assert.AreEqual(original.Length, actual.Length);
@@ -77,7 +77,7 @@
         /// <param name="actual">The actual <see cref="SoilLayer"/> array.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// does not correspond to <paramref name="original"/>.</exception>
-        private static void AssertLayers(MacroStabilityInwardsSoilLayerUnderSurfaceLine[] original, SoilLayer[] actual)
+        private static void AssertLayers(IMacroStabilityInwardsSoilLayerUnderSurfaceLine[] original, SoilLayer[] actual)
         {
             Assert.AreEqual(original.Length, actual.Length);
 
@@ -86,7 +86,7 @@
                 Assert.AreSame(original[i].OuterRing, actual[i].OuterRing);
                 Assert.AreSame(original[i].Holes, actual[i].Holes);
 
-                MacroStabilityInwardsSoilLayerData expectedData = original[i].Data;
+                IMacroStabilityInwardsSoilLayerData expectedData = original[i].Data;
                 Assert.AreEqual(expectedData.MaterialName, actual[i].MaterialName);
                 Assert.AreEqual(expectedData.UsePop, actual[i].UsePop);
                 Assert.AreEqual(expectedData.IsAquifer, actual[i].IsAquifer);