Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesProperties.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesProperties.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesProperties.cs	(revision 72ac518de9bbb165cdd1595cf6f460d8e0f760e3)
@@ -0,0 +1,58 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Ringtoets.Common.Data.AssemblyTool;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.Exceptions;
+using Ringtoets.Common.Data.FailureMechanism;
+
+namespace Ringtoets.Common.Forms.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of the assembly categories in a <see cref="IFailureMechanism"/> for properties panel.
+    /// </summary>
+    public class FailureMechanismAssemblyCategoriesProperties : FailureMechanismAssemblyCategoriesBaseProperties
+    {
+        /// <inheritdoc />
+        /// <summary>
+        /// Creates a new instance of <see cref="FailureMechanismAssemblyCategoriesProperties"/>.
+        /// </summary>
+        public FailureMechanismAssemblyCategoriesProperties(IFailureMechanism failureMechanism,
+                                                            IAssessmentSection assessmentSection,
+                                                            Func<double> getNFunc) : base(failureMechanism, assessmentSection, getNFunc) {}
+
+        /// <inheritdoc />
+        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
+        protected override IEnumerable<FailureMechanismSectionAssemblyCategoryProperties> CreateFailureMechanismSectionAssemblyCategories()
+        {
+            FailureMechanismContribution failureMechanismContribution = AssessmentSection.FailureMechanismContribution;
+            return AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories(failureMechanismContribution.SignalingNorm,
+                                                                                                 failureMechanismContribution.LowerLimitNorm,
+                                                                                                 data.Contribution,
+                                                                                                 GetNFunc())
+                                                .Select(category => new FailureMechanismSectionAssemblyCategoryProperties(category));
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/GeotechnicFailureMechanismAssemblyCategoriesProperties.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/GeotechnicFailureMechanismAssemblyCategoriesProperties.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/GeotechnicFailureMechanismAssemblyCategoriesProperties.cs	(revision 72ac518de9bbb165cdd1595cf6f460d8e0f760e3)
@@ -0,0 +1,58 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Ringtoets.Common.Data.AssemblyTool;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.Exceptions;
+using Ringtoets.Common.Data.FailureMechanism;
+
+namespace Ringtoets.Common.Forms.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of the category boundaries in a geotechnic <see cref="IFailureMechanism"/> for properties panel.
+    /// </summary>
+    public class GeotechnicFailureMechanismAssemblyCategoriesProperties : FailureMechanismAssemblyCategoriesBaseProperties
+    {
+        /// <inheritdoc />
+        /// <summary>
+        /// Creates a new instance of <see cref="GeotechnicFailureMechanismAssemblyCategoriesProperties"/>.
+        /// </summary>
+        public GeotechnicFailureMechanismAssemblyCategoriesProperties(IFailureMechanism failureMechanism,
+                                                                      IAssessmentSection assessmentSection,
+                                                                      Func<double> getNFunc) : base(failureMechanism, assessmentSection, getNFunc) {}
+
+        /// <inheritdoc />
+        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
+        protected override IEnumerable<FailureMechanismSectionAssemblyCategoryProperties> CreateFailureMechanismSectionAssemblyCategories()
+        {
+            FailureMechanismContribution failureMechanismContribution = AssessmentSection.FailureMechanismContribution;
+            return AssemblyToolCategoriesFactory.CreateGeotechnicFailureMechanismSectionAssemblyCategories(failureMechanismContribution.SignalingNorm,
+                                                                                                           failureMechanismContribution.LowerLimitNorm,
+                                                                                                           data.Contribution,
+                                                                                                           GetNFunc())
+                                                .Select(category => new FailureMechanismSectionAssemblyCategoryProperties(category));
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r4d7632a55f75ca47d7cee49166570d91a75d3d8f -r72ac518de9bbb165cdd1595cf6f460d8e0f760e3
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 4d7632a55f75ca47d7cee49166570d91a75d3d8f)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 72ac518de9bbb165cdd1595cf6f460d8e0f760e3)
@@ -93,7 +93,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="PropertyClasses\DesignVariableProperties.cs" />
-    <Compile Include="PropertyClasses\FailureMechanismCategoryBoundariesBaseProperties.cs" />
+    <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesProperties.cs" />
+    <Compile Include="PropertyClasses\GeotechnicFailureMechanismAssemblyCategoriesProperties.cs" />
+    <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesBaseProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionProbabilityAssessmentProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionsProbabilityAssessmentProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionProperties.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs	(revision 72ac518de9bbb165cdd1595cf6f460d8e0f760e3)
@@ -0,0 +1,104 @@
+// 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.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
+using Ringtoets.Common.Data.AssemblyTool;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.Common.Forms.TestUtil;
+
+namespace Ringtoets.Common.Forms.Test.PropertyClasses
+{
+    [TestFixture]
+    public class FailureMechanismAssemblyCategoriesPropertiesTest
+    {
+        [Test]
+        public void Constructor_ValidParameters_ExpectedValues()
+        {
+            // Setup
+            const double n = 1.0;
+
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            failureMechanism.Contribution = 5;
+            var assessmentSection = new AssessmentSectionStub();
+            mocks.ReplayAll();
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                // Call
+                var properties = new FailureMechanismAssemblyCategoriesProperties(failureMechanism,
+                                                                                  assessmentSection,
+                                                                                  () => n);
+
+                // Assert
+                Assert.IsInstanceOf<FailureMechanismAssemblyCategoriesBaseProperties>(properties);
+
+                FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution;
+                IEnumerable<FailureMechanismAssemblyCategory> expectedFailureMechanismCategories =
+                    AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(
+                        failureMechanismContribution.SignalingNorm,
+                        failureMechanismContribution.LowerLimitNorm,
+                        failureMechanism.Contribution,
+                        n);
+
+                IEnumerable<FailureMechanismSectionAssemblyCategory> expectedFailureMechanismSectionCategories =
+                    AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories(
+                        failureMechanismContribution.SignalingNorm,
+                        failureMechanismContribution.LowerLimitNorm,
+                        failureMechanism.Contribution,
+                        n);
+
+                AssemblyCategoryPropertiesTestHelper.AssertFailureMechanismAssemblyCategoryProperties(
+                    expectedFailureMechanismCategories,
+                    expectedFailureMechanismSectionCategories,
+                    properties);
+
+                mocks.VerifyAll();
+            }
+        }
+
+        [Test]
+        public void Constructor_Always_ReturnsExpectedPropertyCount()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            var assessmentSection = new AssessmentSectionStub();
+            mocks.ReplayAll();
+
+            // Call
+            var properties = new FailureMechanismAssemblyCategoriesProperties(failureMechanism,
+                                                                              assessmentSection,
+                                                                              () => 0.01);
+            // Assert
+            Assert.AreEqual(2, PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties).Count);
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/GeotechnicFailureMechanismAssemblyCategoriesPropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/GeotechnicFailureMechanismAssemblyCategoriesPropertiesTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/GeotechnicFailureMechanismAssemblyCategoriesPropertiesTest.cs	(revision 72ac518de9bbb165cdd1595cf6f460d8e0f760e3)
@@ -0,0 +1,104 @@
+// 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.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
+using Ringtoets.Common.Data.AssemblyTool;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.Common.Forms.TestUtil;
+
+namespace Ringtoets.Common.Forms.Test.PropertyClasses
+{
+    [TestFixture]
+    public class GeotechnicFailureMechanismAssemblyCategoriesPropertiesTest
+    {
+        [Test]
+        public void Constructor_ValidParameters_ExpectedValues()
+        {
+            // Setup
+            const double n = 1.0;
+
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            failureMechanism.Contribution = 5;
+            var assessmentSection = new AssessmentSectionStub();
+            mocks.ReplayAll();
+
+            using (new AssemblyToolCalculatorFactoryConfig())
+            {
+                // Call
+                var properties = new GeotechnicFailureMechanismAssemblyCategoriesProperties(failureMechanism,
+                                                                                            assessmentSection,
+                                                                                            () => n);
+
+                // Assert
+                Assert.IsInstanceOf<FailureMechanismAssemblyCategoriesBaseProperties>(properties);
+
+                FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution;
+                IEnumerable<FailureMechanismAssemblyCategory> expectedFailureMechanismCategories =
+                    AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(
+                        failureMechanismContribution.SignalingNorm,
+                        failureMechanismContribution.LowerLimitNorm,
+                        failureMechanism.Contribution,
+                        n);
+
+                IEnumerable<FailureMechanismSectionAssemblyCategory> expectedFailureMechanismSectionCategories =
+                    AssemblyToolCategoriesFactory.CreateGeotechnicFailureMechanismSectionAssemblyCategories(
+                        failureMechanismContribution.SignalingNorm,
+                        failureMechanismContribution.LowerLimitNorm,
+                        failureMechanism.Contribution,
+                        n);
+
+                AssemblyCategoryPropertiesTestHelper.AssertFailureMechanismAssemblyCategoryProperties(
+                    expectedFailureMechanismCategories,
+                    expectedFailureMechanismSectionCategories,
+                    properties);
+
+                mocks.VerifyAll();
+            }
+        }
+
+        [Test]
+        public void Constructor_Always_ReturnsExpectedPropertyCount()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            var assessmentSection = new AssessmentSectionStub();
+            mocks.ReplayAll();
+
+            // Call
+            var properties = new GeotechnicFailureMechanismAssemblyCategoriesProperties(failureMechanism,
+                                                                                        assessmentSection,
+                                                                                        () => 0.01);
+            // Assert
+            Assert.AreEqual(2, PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties).Count);
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r4d7632a55f75ca47d7cee49166570d91a75d3d8f -r72ac518de9bbb165cdd1595cf6f460d8e0f760e3
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 4d7632a55f75ca47d7cee49166570d91a75d3d8f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 72ac518de9bbb165cdd1595cf6f460d8e0f760e3)
@@ -95,10 +95,12 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\BreakWaterPropertiesTest.cs" />
     <Compile Include="PropertyClasses\DesignVariablePropertiesTest.cs" />
+    <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\GeotechnicFailureMechanismAssemblyCategoriesPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionsProbabilityAssessmentPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\FailureMechanismCategoryBoundariesBasePropertiesTest.cs" />
+    <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesBasePropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionsPropertiesTest.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationPropertiesTest.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationsPropertiesTest.cs" />
@@ -255,6 +257,10 @@
       <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
       <Name>Ringtoets.AssemblyTool.Forms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\test\Ringtoets.AssemblyTool.KernelWrapper.TestUtil\Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj">
+      <Project>{0AB432BB-E2CC-42EA-A72C-7AFEF7536B38}</Project>
+      <Name>Ringtoets.AssemblyTool.KernelWrapper.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>