Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ae14c5d4e4624fa87390e6d63bb419c648e12dda)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -82,6 +82,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Nieuwe berekening.
+        /// </summary>
+        public static string StabilityPointStructuresCalculation_DefaultName {
+            get {
+                return ResourceManager.GetString("StabilityPointStructuresCalculation_DefaultName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to STKWp.
         /// </summary>
         public static string StabilityPointStructuresFailureMechanism_Code {
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.resx
===================================================================
diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.resx	(.../Resources.resx)	(revision ae14c5d4e4624fa87390e6d63bb419c648e12dda)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.resx	(.../Resources.resx)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="StabilityPointStructuresCalculation_DefaultName" xml:space="preserve">
+    <value>Nieuwe berekening</value>
+  </data>
   <data name="StabilityPointStructuresFailureMechanism_Code" xml:space="preserve">
     <value>STKWp</value>
   </data>
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj
===================================================================
diff -u -r61996e001a167a5ae468e6324c39133bd12962e4 -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj	(.../Ringtoets.StabilityPointStructures.Data.csproj)	(revision 61996e001a167a5ae468e6324c39133bd12962e4)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj	(.../Ringtoets.StabilityPointStructures.Data.csproj)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -46,8 +46,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="StabilityPointStructuresCalculation.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanism.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanismSectionResult.cs" />
+    <Compile Include="StabilityPointStructuresInput.cs" />
+    <Compile Include="StabilityPointStructuresOutput.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
@@ -65,6 +68,11 @@
       <Name>Ringtoets.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,88 @@
+// Copyright (C) Stichting Deltares 2016. 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;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.StabilityPointStructures.Data.Properties;
+
+namespace Ringtoets.StabilityPointStructures.Data
+{
+    /// <summary>
+    /// This class holds information about a calculation for the <see cref="StabilityPointStructuresFailureMechanism"/>.
+    /// </summary>
+    public class StabilityPointStructuresCalculation : Observable, ICalculation
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="StabilityPointStructuresCalculation"/>.
+        /// </summary>
+        public StabilityPointStructuresCalculation()
+        {
+            Name = Resources.StabilityPointStructuresCalculation_DefaultName;
+            InputParameters = new StabilityPointStructuresInput();
+        }
+
+        /// <summary>
+        /// Gets the input parameters to perform a stability point structures calculation with.
+        /// </summary>
+        public StabilityPointStructuresInput InputParameters { get; private set; }
+
+        /// <summary>
+        /// Gets or sets <see cref="StabilityPointStructuresOutput"/>, which contains the results of a calculation.
+        /// </summary>
+        public StabilityPointStructuresOutput Output { get; set; }
+
+        public string Comments { get; set; }
+
+        public string Name { get; set; }
+
+        public bool HasOutput
+        {
+            get
+            {
+                return Output != null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a string that represents the current object.
+        /// </summary>
+        /// <returns>The name of this calculation.</returns>
+        public override string ToString()
+        {
+            return Name;
+        }
+
+        public void ClearOutput()
+        {
+            Output = null;
+        }
+
+        public ICalculationInput GetObservableInput()
+        {
+            return InputParameters;
+        }
+
+        public ICalculationOutput GetObservableOutput()
+        {
+            return Output;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,43 @@
+// Copyright (C) Stichting Deltares 2016. 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;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.StabilityPointStructures.Data
+{
+    /// <summary>
+    /// Class that holds all stability point structures calculation specific input parameters.
+    /// </summary>
+    public class StabilityPointStructuresInput : Observable, ICalculationInput
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="StabilityPointStructuresInput"/>.
+        /// </summary>
+        public StabilityPointStructuresInput() {}
+
+        /// <summary>
+        /// Gets or sets the hydraulic boundary location from which to use the assessment level.
+        /// </summary>
+        public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresOutput.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresOutput.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresOutput.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2016. 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;
+using Ringtoets.Common.Data.Calculation;
+
+namespace Ringtoets.StabilityPointStructures.Data
+{
+    /// <summary>
+    /// The result of a stability point structures assessment.
+    /// </summary>
+    public class StabilityPointStructuresOutput : Observable, ICalculationOutput
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="StabilityPointStructuresOutput"/>.
+        /// </summary>
+        public StabilityPointStructuresOutput() {}
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,50 @@
+// Copyright (C) Stichting Deltares 2016. 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 Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.StabilityPointStructures.Data;
+
+namespace Ringtoets.StabilityPointStructures.Forms.PresentationObjects
+{
+    /// <summary>
+    /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
+    /// in order be able to create configurable stability point structures calculations.
+    /// </summary>
+    public class StabilityPointStructuresCalculationGroupContext : StabilityPointStructuresContext<CalculationGroup>,
+                                                                   ICalculationContext<CalculationGroup,
+                                                                       StabilityPointStructuresFailureMechanism>
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="StabilityPointStructuresCalculationGroupContext"/>.
+        /// </summary>
+        /// <param name="calculationsGroup">The <see cref="CalculationGroup"/> instance wrapped by this context object.</param>
+        /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
+        /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
+        /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
+        public StabilityPointStructuresCalculationGroupContext(CalculationGroup calculationsGroup,
+                                                               StabilityPointStructuresFailureMechanism failureMechanism,
+                                                               IAssessmentSection assessmentSection)
+            : base(calculationsGroup, failureMechanism, assessmentSection) {}
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresContext.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresContext.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresContext.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,92 @@
+// Copyright (C) Stichting Deltares 2016. 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 Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.StabilityPointStructures.Data;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.StabilityPointStructures.Forms.PresentationObjects
+{
+    /// <summary>
+    /// Presentation object representing all required stability point structures input knowledge to configure and create
+    /// related objects. It will delegate observable behavior to the wrapped data object.
+    /// </summary>
+    public class StabilityPointStructuresContext<T> : ObservableWrappedObjectContextBase<T> where T : IObservable
+    {
+         /// <summary>
+        /// Initializes a new instance of the <see cref="StabilityPointStructuresContext{T}"/> class.
+        /// </summary>
+        /// <param name="wrappedData">The concrete data instance wrapped by this context object.</param>
+        /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
+        /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
+        /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
+        protected StabilityPointStructuresContext(
+            T wrappedData,
+            StabilityPointStructuresFailureMechanism failureMechanism,
+            IAssessmentSection assessmentSection)
+            : base(wrappedData)
+        {
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException("failureMechanism");
+            }
+
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException("assessmentSection");
+            }
+
+            FailureMechanism = failureMechanism;
+            AssessmentSection = assessmentSection;
+        }
+
+        /// <summary>
+        /// Gets the failure mechanism which the context belongs to.
+        /// </summary>
+        public StabilityPointStructuresFailureMechanism FailureMechanism { get; private set; }
+
+        /// <summary>
+        /// Gets the assessment section which the context belongs to.
+        /// </summary>
+        public IAssessmentSection AssessmentSection { get; private set; }
+
+       
+        /// <summary>
+        /// Gets the available hydraulic boundary locations in order for the user to select one to 
+        /// set <see cref="StabilityPointStructuresInput.HydraulicBoundaryLocation"/>.
+        /// </summary>
+        public IEnumerable<HydraulicBoundaryLocation> AvailableHydraulicBoundaryLocations
+        {
+            get
+            {
+                return AssessmentSection.HydraulicBoundaryDatabase == null ?
+                           Enumerable.Empty<HydraulicBoundaryLocation>() :
+                           AssessmentSection.HydraulicBoundaryDatabase.Locations;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Ringtoets.StabilityPointStructures.Forms.csproj
===================================================================
diff -u -re5f4a598d201934e48ab71795fb3b19cb9a960b1 -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Ringtoets.StabilityPointStructures.Forms.csproj	(.../Ringtoets.StabilityPointStructures.Forms.csproj)	(revision e5f4a598d201934e48ab71795fb3b19cb9a960b1)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Ringtoets.StabilityPointStructures.Forms.csproj	(.../Ringtoets.StabilityPointStructures.Forms.csproj)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -40,6 +40,8 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="PresentationObjects\StabilityPointStructuresCalculationGroupContext.cs" />
+    <Compile Include="PresentationObjects\StabilityPointStructuresContext.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresFailureMechanismContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Views\StabilityPointStructuresFailureMechanismResultView.cs">
@@ -78,6 +80,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.StabilityPointStructures.Data\Ringtoets.StabilityPointStructures.Data.csproj">
       <Project>{3d4b9740-8348-4434-8d77-b611fc6ee57f}</Project>
       <Name>Ringtoets.StabilityPointStructures.Data</Name>
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Properties/Resources.Designer.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Properties/Resources.Designer.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,93 @@
+// Copyright (C) Stichting Deltares 2016. 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.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Ringtoets.StabilityPointStructures.Plugin.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ringtoets.StabilityPointStructures.Plugin.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Genereer scenario&apos;s.
+        /// </summary>
+        public static string StabilityPointStructuresPlugin_CreateGenerateCalculationsItem_ToolTip {
+            get {
+                return ResourceManager.GetString("StabilityPointStructuresPlugin_CreateGenerateCalculationsItem_ToolTip", resourceCulture);
+            }
+        }
+    }
+}
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Properties/Resources.resx
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Properties/Resources.resx	(revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Properties/Resources.resx	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="StabilityPointStructuresPlugin_CreateGenerateCalculationsItem_ToolTip" xml:space="preserve">
+    <value>Genereer scenario's</value>
+  </data>
+</root>
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Ringtoets.StabilityPointStructures.Plugin.csproj
===================================================================
diff -u -re5f4a598d201934e48ab71795fb3b19cb9a960b1 -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Ringtoets.StabilityPointStructures.Plugin.csproj	(.../Ringtoets.StabilityPointStructures.Plugin.csproj)	(revision e5f4a598d201934e48ab71795fb3b19cb9a960b1)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Ringtoets.StabilityPointStructures.Plugin.csproj	(.../Ringtoets.StabilityPointStructures.Plugin.csproj)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -42,6 +42,11 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="StabilityPointStructuresPlugin.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -91,6 +96,12 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -re5f4a598d201934e48ab71795fb3b19cb9a960b1 -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision e5f4a598d201934e48ab71795fb3b19cb9a960b1)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -24,16 +24,20 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls.TreeView;
+using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Plugin;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Forms.Views;
+using Ringtoets.StabilityPointStructures.Plugin.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
+using StabilityPointStructuresDataResources = Ringtoets.StabilityPointStructures.Data.Properties.Resources;
 
 namespace Ringtoets.StabilityPointStructures.Plugin
 {
@@ -42,7 +46,7 @@
     /// </summary>
     public class StabilityPointStructuresPlugin : PluginBase
     {
-         public override IEnumerable<ViewInfo> GetViewInfos()
+        public override IEnumerable<ViewInfo> GetViewInfos()
         {
             yield return new ViewInfo<
                 FailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>,
@@ -76,8 +80,40 @@
                                                                                  .AddOpenItem()
                                                                                  .Build()
             };
+
+            yield return RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<StabilityPointStructuresCalculationGroupContext>(
+                CalculationGroupContextChildNodeObjects,
+                CalculationGroupContextContextMenuStrip,
+                CalculationGroupContextOnNodeRemoved);
         }
 
+        #region ViewInfo
+
+        #region StabilityPointStructuresFailureMechanismResultView ViewInfo
+
+        private static bool CloseFailureMechanismResultViewForData(StabilityPointStructuresFailureMechanismResultView view, object o)
+        {
+            var assessmentSection = o as IAssessmentSection;
+            var failureMechanism = o as StabilityPointStructuresFailureMechanism;
+            var failureMechanismContext = o as IFailureMechanismContext<StabilityPointStructuresFailureMechanism>;
+            if (assessmentSection != null)
+            {
+                return assessmentSection
+                    .GetFailureMechanisms()
+                    .OfType<StabilityPointStructuresFailureMechanism>()
+                    .Any(fm => ReferenceEquals(view.Data, fm.SectionResults));
+            }
+            if (failureMechanismContext != null)
+            {
+                failureMechanism = failureMechanismContext.WrappedData;
+            }
+            return failureMechanism != null && ReferenceEquals(view.Data, failureMechanism.SectionResults);
+        }
+
+        #endregion
+
+        #endregion
+
         #region TreeNodeInfo
 
         #region StabilityPointStructuresFailureMechanismContext TreeNodeInfo
@@ -88,6 +124,7 @@
             return new object[]
             {
                 new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, stabilityPointStructuresFailureMechanismContext.Parent), TreeFolderCategory.Input),
+                new StabilityPointStructuresCalculationGroupContext(wrappedData.CalculationsGroup, wrappedData, stabilityPointStructuresFailureMechanismContext.Parent),
                 new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData), TreeFolderCategory.Output)
             };
         }
@@ -148,31 +185,95 @@
 
         #endregion
 
-        #endregion
-        
-        #region ViewInfo
+        #region StabilityPointStructuresCalculationGroupContext TreeNodeInfo
 
-        #region StabilityPointStructuresFailureMechanismResultView ViewInfo
+        private static object[] CalculationGroupContextChildNodeObjects(StabilityPointStructuresCalculationGroupContext context)
+        {
+            var childNodeObjects = new List<object>();
 
-        private static bool CloseFailureMechanismResultViewForData(StabilityPointStructuresFailureMechanismResultView view, object o)
+            foreach (ICalculationBase calculationItem in context.WrappedData.Children)
+            {
+                var group = calculationItem as CalculationGroup;
+                if (group != null)
+                {
+                    childNodeObjects.Add(new StabilityPointStructuresCalculationGroupContext(group,
+                                                                                             context.FailureMechanism,
+                                                                                             context.AssessmentSection));
+                }
+                else
+                {
+                    childNodeObjects.Add(calculationItem);
+                }
+            }
+
+            return childNodeObjects.ToArray();
+        }
+
+        private ContextMenuStrip CalculationGroupContextContextMenuStrip(StabilityPointStructuresCalculationGroupContext context, object parentData, TreeViewControl treeViewControl)
         {
-            var assessmentSection = o as IAssessmentSection;
-            var failureMechanism = o as StabilityPointStructuresFailureMechanism;
-            var failureMechanismContext = o as IFailureMechanismContext<StabilityPointStructuresFailureMechanism>;
-            if (assessmentSection != null)
+            CalculationGroup group = context.WrappedData;
+            var builder = new RingtoetsContextMenuBuilder(Gui.Get(context, treeViewControl));
+            var isNestedGroup = parentData is StabilityPointStructuresCalculationGroupContext;
+
+            StrictContextMenuItem generateCalculationsItem = CreateGenerateCalculationsItem(context);
+
+            if (!isNestedGroup)
             {
-                return assessmentSection
-                    .GetFailureMechanisms()
-                    .OfType<StabilityPointStructuresFailureMechanism>()
-                    .Any(fm => ReferenceEquals(view.Data, fm.SectionResults));
+                builder.AddCustomItem(generateCalculationsItem)
+                       .AddSeparator();
             }
-            if (failureMechanismContext != null)
+
+            builder.AddCreateCalculationGroupItem(group)
+                   .AddCreateCalculationItem(context, AddCalculation);
+
+            if (!isNestedGroup)
             {
-                failureMechanism = failureMechanismContext.WrappedData;
+                builder.AddSeparator()
+                       .AddRemoveAllChildrenItem(group, Gui.ViewCommands);
             }
-            return failureMechanism != null && ReferenceEquals(view.Data, failureMechanism.SectionResults);
+
+            builder.AddSeparator()
+                   .AddValidateAllCalculationsInGroupItem(context, null)
+                   .AddPerformAllCalculationsInGroupItem(group, context, null)
+                   .AddClearAllCalculationOutputInGroupItem(group)
+                   .AddSeparator();
+
+            if (isNestedGroup)
+            {
+                builder.AddRenameItem()
+                       .AddDeleteItem()
+                       .AddSeparator();
+            }
+
+            return builder.AddExpandAllItem()
+                          .AddCollapseAllItem()
+                          .AddSeparator()
+                          .AddPropertiesItem()
+                          .Build();
         }
 
+        private StrictContextMenuItem CreateGenerateCalculationsItem(StabilityPointStructuresCalculationGroupContext nodeData)
+        {
+            var generateCalculationsItem = new StrictContextMenuItem(
+                RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios,
+                Resources.StabilityPointStructuresPlugin_CreateGenerateCalculationsItem_ToolTip,
+                RingtoetsCommonFormsResources.GenerateScenariosIcon, (o, args) => { })
+            {
+                Enabled = false
+            };
+            return generateCalculationsItem;
+        }
+
+        private static void CalculationGroupContextOnNodeRemoved(StabilityPointStructuresCalculationGroupContext context, object parentNodeData)
+        {
+            var parentGroupContext = (StabilityPointStructuresCalculationGroupContext) parentNodeData;
+
+            parentGroupContext.WrappedData.Children.Remove(context.WrappedData);
+            parentGroupContext.NotifyObservers();
+        }
+
+        private static void AddCalculation(StabilityPointStructuresCalculationGroupContext context) {}
+
         #endregion
 
         #endregion
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj
===================================================================
diff -u -r61996e001a167a5ae468e6324c39133bd12962e4 -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj	(.../Ringtoets.StabilityPointStructures.Data.Test.csproj)	(revision 61996e001a167a5ae468e6324c39133bd12962e4)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj	(.../Ringtoets.StabilityPointStructures.Data.Test.csproj)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -50,8 +50,11 @@
     </Compile>
     <Compile Include="GeneralStabilityPointStructuresInputTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StabilityPointStructuresCalculationTest.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanismSectionResultTest.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanismTest.cs" />
+    <Compile Include="StabilityPointStructuresInputTest.cs" />
+    <Compile Include="StabilityPointStructuresOutputTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
@@ -76,6 +79,10 @@
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.StabilityPointStructures.Data\Ringtoets.StabilityPointStructures.Data.csproj">
       <Project>{3D4B9740-8348-4434-8D77-B611FC6EE57F}</Project>
       <Name>Ringtoets.StabilityPointStructures.Data</Name>
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresCalculationTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresCalculationTest.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresCalculationTest.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,172 @@
+// Copyright (C) Stichting Deltares 2016. 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;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+
+namespace Ringtoets.StabilityPointStructures.Data.Test
+{
+    [TestFixture]
+    public class StabilityPointStructuresCalculationTest
+    {
+        [Test]
+        public void Constructor_DefaultPropertyValuesAreSet()
+        {
+            // Call
+            var calculation = new StabilityPointStructuresCalculation();
+
+            // Assert
+            Assert.IsInstanceOf<ICalculation>(calculation);
+            Assert.IsInstanceOf<Observable>(calculation);
+
+            Assert.AreEqual("Nieuwe berekening", calculation.Name);
+            Assert.IsNotNull(calculation.InputParameters);
+            Assert.IsFalse(calculation.HasOutput);
+            Assert.IsNull(calculation.Comments);
+            Assert.IsNull(calculation.Output);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase(" ")]
+        public void Properties_Name_ReturnsExpectedValues(string name)
+        {
+            // Setup
+            var calculation = new StabilityPointStructuresCalculation();
+
+            // Call
+            calculation.Name = name;
+
+            // Assert
+            Assert.AreEqual(name, calculation.Name);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase(" ")]
+        public void Property_Comments_ReturnsExpectedValues(string comments)
+        {
+            // Setup
+            var calculation = new StabilityPointStructuresCalculation();
+
+            // Call
+            calculation.Comments = comments;
+
+            // Assert
+            Assert.AreEqual(comments, calculation.Comments);
+        }
+
+        [Test]
+        public void ToString_Always_ReturnsExpectedValue()
+        {
+            // Setup
+            const string name = "StabilityPointStructuresCalculation";
+            var calculation = new StabilityPointStructuresCalculation()
+            {
+                Name = name
+            };
+
+            // Call
+            string toString = calculation.ToString();
+
+            // Assert
+            Assert.AreEqual(name, toString);
+        }
+
+        [Test]
+        public void ClearOutput_Always_SetsOutputToNull()
+        {
+            // Setup
+            var calculation = new StabilityPointStructuresCalculation
+            {
+                Output = new TestStabilityPointStructuresOutput()
+            };
+
+            // Call
+            calculation.ClearOutput();
+
+            // Assert
+            Assert.IsNull(calculation.Output);
+        }
+
+        [Test]
+        public void HasOutput_OutputNull_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new StabilityPointStructuresCalculation
+            {
+                Output = null
+            };
+
+            // Call & Assert
+            Assert.IsFalse(calculation.HasOutput);
+        }
+
+        [Test]
+        public void HasOutput_OutputSet_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new StabilityPointStructuresCalculation
+            {
+                Output = new TestStabilityPointStructuresOutput()
+            };
+
+            // Call & Assert
+            Assert.IsTrue(calculation.HasOutput);
+        }
+
+        [Test]
+        public void GetObservableInput_Always_ReturnsInputParameters()
+        {
+            // Setup
+            var calculation = new StabilityPointStructuresCalculation();
+            var inputParameters = calculation.InputParameters;
+
+            // Call
+            ICalculationInput input = calculation.GetObservableInput();
+
+            // Assert
+            Assert.AreSame(inputParameters, input);
+        }
+
+        [Test]
+        public void GetObservableOutput_Always_ReturnsOutput()
+        {
+            // Setup
+            var output = new TestStabilityPointStructuresOutput();
+            var calculation = new StabilityPointStructuresCalculation
+            {
+                Output = output
+            };
+
+            // Call
+            ICalculationOutput calculationOutput = calculation.GetObservableOutput();
+
+            // Assert
+            Assert.AreSame(output, calculationOutput);
+        }
+
+        private class TestStabilityPointStructuresOutput : StabilityPointStructuresOutput {}
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,43 @@
+// Copyright (C) Stichting Deltares 2016. 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;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+
+namespace Ringtoets.StabilityPointStructures.Data.Test
+{
+    [TestFixture]
+    public class StabilityPointStructuresInputTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var input = new StabilityPointStructuresInput();
+
+            // Assert
+            Assert.IsInstanceOf<Observable>(input);
+            Assert.IsInstanceOf<ICalculationInput>(input);
+            Assert.IsNull(input.HydraulicBoundaryLocation);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresOutputTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresOutputTest.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresOutputTest.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,42 @@
+// Copyright (C) Stichting Deltares 2016. 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;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+
+namespace Ringtoets.StabilityPointStructures.Data.Test
+{
+    [TestFixture]
+    public class StabilityPointStructuresOutputTest
+    {
+        [Test]
+        public void ParameteredConstructor_DefaultValues()
+        {
+            // Call
+            StabilityPointStructuresOutput output = new StabilityPointStructuresOutput();
+
+            // Assert
+            Assert.IsInstanceOf<ICalculationOutput>(output);
+            Assert.IsInstanceOf<Observable>(output);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,58 @@
+// Copyright (C) Stichting Deltares 2016. 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 NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.StabilityPointStructures.Data;
+using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
+
+namespace Ringtoets.StabilityPointStructures.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class StabilityPointStructuresCalculationGroupContextTest
+    {
+        [Test]
+        public void ParameteredConstructor_ExpectedValues()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            mockRepository.ReplayAll();
+
+            var calculationGroup = new CalculationGroup();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+
+            // Call
+            var groupContext = new StabilityPointStructuresCalculationGroupContext(calculationGroup, failureMechanism, assessmentSectionMock);
+
+            // Assert
+            Assert.IsInstanceOf<StabilityPointStructuresContext<CalculationGroup>>(groupContext);
+            Assert.IsInstanceOf<ICalculationContext<CalculationGroup, StabilityPointStructuresFailureMechanism>>(groupContext);
+            Assert.AreSame(calculationGroup, groupContext.WrappedData);
+            Assert.AreSame(failureMechanism, groupContext.FailureMechanism);
+            Assert.AreSame(assessmentSectionMock, groupContext.AssessmentSection);
+            mockRepository.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresContextTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresContextTest.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresContextTest.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,129 @@
+// Copyright (C) Stichting Deltares 2016. 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.Linq;
+using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.StabilityPointStructures.Data;
+using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
+
+namespace Ringtoets.StabilityPointStructures.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class StabilityPointStructuresContextTest
+    {
+        [Test]
+        public void ParameteredConstructor_ExpectedValues()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
+            mockRepository.ReplayAll();
+
+            var target = new ObservableObject();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+
+            // Call
+            var context = new SimpleStabilityPointStructuresContext<ObservableObject>(target, failureMechanism, assessmentSectionMock);
+
+            // Assert
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ObservableObject>>(context);
+            Assert.AreSame(target, context.WrappedData);
+            Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
+            Assert.AreSame(failureMechanism, context.FailureMechanism);
+            CollectionAssert.IsEmpty(context.AvailableHydraulicBoundaryLocations);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void ParameteredConstructor_FailureMechanismIsNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            mockRepository.ReplayAll();
+
+            var observableObject = new ObservableObject();
+
+            // Call
+            TestDelegate call = () => new SimpleStabilityPointStructuresContext<ObservableObject>(observableObject, null, assessmentSectionMock);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("failureMechanism", paramName);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void ParameteredConstructor_AssessmentSectionIsNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var observableObject = new ObservableObject();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+
+            // Call
+            TestDelegate call = () => new SimpleStabilityPointStructuresContext<ObservableObject>(observableObject, failureMechanism, null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("assessmentSection", paramName);
+        }
+
+        [Test]
+        public void AvailableHydraulicBoundaryLocations_HydraulicBoundaryDatabaseSet_ReturnsAllHydraulicBoundaryLocations()
+        {
+            // Setup
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "name", 1.1, 2.2));
+
+            var mockRepository = new MockRepository();
+            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.Twice();
+            mockRepository.ReplayAll();
+
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var target = new ObservableObject();
+            var context = new SimpleStabilityPointStructuresContext<ObservableObject>(target, failureMechanism, assessmentSectionMock);
+
+            // Call
+            var availableHydraulicBoundaryLocations = context.AvailableHydraulicBoundaryLocations;
+
+            // Assert
+            Assert.AreEqual(1, availableHydraulicBoundaryLocations.Count());
+            Assert.AreEqual(hydraulicBoundaryDatabase.Locations, availableHydraulicBoundaryLocations);
+            mockRepository.VerifyAll();
+        }
+
+        private class ObservableObject : Observable {}
+
+        private class SimpleStabilityPointStructuresContext<T> : StabilityPointStructuresContext<T> where T : IObservable
+        {
+            public SimpleStabilityPointStructuresContext(T target, StabilityPointStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+                : base(target, failureMechanism, assessmentSection) {}
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj
===================================================================
diff -u -r7a813dee8d40d6bcbcf17ded65418e1800360ac1 -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj	(.../Ringtoets.StabilityPointStructures.Forms.Test.csproj)	(revision 7a813dee8d40d6bcbcf17ded65418e1800360ac1)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj	(.../Ringtoets.StabilityPointStructures.Forms.Test.csproj)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -57,8 +57,11 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="PresentationObjects\StabilityPointStructuresCalculationGroupContextTest.cs" />
+    <Compile Include="PresentationObjects\StabilityPointStructuresContextTest.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresFailureMechanismContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TreeNodeInfos\StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\StabilityPointStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs" />
     <Compile Include="Views\StabilityPointStructuresFailureMechanismResultViewTest.cs" />
@@ -111,6 +114,10 @@
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.StabilityPointStructures.Data\Ringtoets.StabilityPointStructures.Data.csproj">
       <Project>{3D4B9740-8348-4434-8D77-B611FC6EE57F}</Project>
       <Name>Ringtoets.StabilityPointStructures.Data</Name>
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -0,0 +1,491 @@
+// Copyright (C) Stichting Deltares 2016. 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.Linq;
+using System.Windows.Forms;
+using Core.Common.Base;
+using Core.Common.Controls.TreeView;
+using Core.Common.Gui;
+using Core.Common.Gui.Commands;
+using Core.Common.Gui.ContextMenu;
+using Core.Common.Gui.TestUtil.ContextMenu;
+using Core.Common.TestUtil;
+using NUnit.Extensions.Forms;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.StabilityPointStructures.Data;
+using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
+using Ringtoets.StabilityPointStructures.Plugin;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.StabilityPointStructures.Forms.Test.TreeNodeInfos
+{
+    [TestFixture]
+    public class StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
+    {
+        private const int contextMenuAddCalculationGroupIndexRootGroup = 2;
+        private const int contextMenuAddCalculationIndexRootGroup = 3;
+        private const int contextMenuRemoveAllChildrenRootGroupIndex = 5;
+        private const int contextMenuValidateAllIndexRootGroup = 7;
+        private const int contextMenuCalculateAllIndexRootGroup = 8;
+        private const int contextMenuClearAllIndexRootGroup = 9;
+
+        private const int contextMenuAddCalculationGroupIndexNestedGroup = 0;
+        private const int contextMenuAddCalculationIndexNestedGroup = 1;
+        private const int contextMenuValidateAllIndexNestedGroup = 3;
+        private const int contextMenuCalculateAllIndexNestedGroup = 4;
+        private const int contextMenuClearAllIndexNestedGroup = 5;
+
+        private IGui guiMock;
+        private TreeNodeInfo info;
+        private MockRepository mocks;
+        private StabilityPointStructuresPlugin plugin;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+            guiMock = mocks.StrictMock<IGui>();
+            plugin = new StabilityPointStructuresPlugin
+            {
+                Gui = guiMock
+            };
+
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StabilityPointStructuresCalculationGroupContext));
+        }
+
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Setup
+            mocks.ReplayAll();
+
+            // Assert
+            Assert.AreEqual(typeof(StabilityPointStructuresCalculationGroupContext), info.TagType);
+            Assert.IsNotNull(info.Text);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.EnsureVisibleOnCreate);
+            Assert.IsNotNull(info.ChildNodeObjects);
+            Assert.IsNotNull(info.ContextMenuStrip);
+            Assert.IsNotNull(info.CanRename);
+            Assert.IsNotNull(info.OnNodeRenamed);
+            Assert.IsNotNull(info.CanRemove);
+            Assert.IsNotNull(info.OnNodeRemoved);
+            Assert.IsNotNull(info.CanDrag);
+            Assert.IsNotNull(info.CanInsert);
+            Assert.IsNotNull(info.CanDrop);
+            Assert.IsNotNull(info.OnDrop);
+            Assert.IsNull(info.ForeColor);
+            Assert.IsNull(info.CanCheck);
+            Assert.IsNull(info.IsChecked);
+            Assert.IsNull(info.OnNodeChecked);
+        }
+
+        [Test]
+        public void ChildNodeObjects_EmptyGroup_ReturnEmpty()
+        {
+            // Setup
+            var group = new CalculationGroup();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var groupContext = new StabilityPointStructuresCalculationGroupContext(group,
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
+
+            // Call
+            var children = info.ChildNodeObjects(groupContext);
+
+            // Assert
+            CollectionAssert.IsEmpty(children);
+        }
+
+        [Test]
+        public void ChildNodeObjects_GroupWithMixedContents_ReturnChildren()
+        {
+            // Setup
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var calculationItemMock = mocks.StrictMock<ICalculationBase>();
+            mocks.ReplayAll();
+
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var group = new CalculationGroup();
+            var childGroup = new CalculationGroup();
+
+            group.Children.Add(childGroup);
+            group.Children.Add(calculationItemMock);
+
+            var groupContext = new StabilityPointStructuresCalculationGroupContext(group,
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
+
+            // Call
+            var children = info.ChildNodeObjects(groupContext).ToArray();
+
+            // Assert
+            Assert.AreEqual(group.Children.Count, children.Length);
+            var calculationGroupContext = (StabilityPointStructuresCalculationGroupContext) children[0];
+            Assert.AreSame(childGroup, calculationGroupContext.WrappedData);
+            Assert.AreSame(failureMechanism, calculationGroupContext.FailureMechanism);
+            Assert.AreSame(assessmentSectionMock, calculationGroupContext.AssessmentSection);
+            Assert.AreSame(calculationItemMock, children[1]);
+        }
+
+        [Test]
+        public void ContextMenuStrip_WithoutParentNodeDefaultBehavior_CallsContextMenuBuilderMethods()
+        {
+            // Setup
+            var group = new CalculationGroup();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var groupContext = new StabilityPointStructuresCalculationGroupContext(group,
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
+
+            var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
+
+            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock);
+                guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub<IViewCommands>());
+                mocks.ReplayAll();
+
+                // Call
+                info.ContextMenuStrip(groupContext, null, treeViewControl);
+            }
+
+            // Assert
+            // Assert expectancies called in TearDown()
+        }
+
+        [Test]
+        public void ContextMenuStrip_WithoutParentNodeDefaultBehavior_AddCustomItems()
+        {
+            // Setup
+            var group = new CalculationGroup();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var groupContext = new StabilityPointStructuresCalculationGroupContext(group,
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+                guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder);
+                guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub<IViewCommands>());
+
+                mocks.ReplayAll();
+
+                // Call
+                using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl))
+                {
+                    // Assert
+                    Assert.AreEqual(12, menu.Items.Count);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                                  RingtoetsCommonFormsResources.AddFolderIcon);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                                  RingtoetsCommonFormsResources.FailureMechanismIcon);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRemoveAllChildrenRootGroupIndex,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_Remove_all,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_RemoveAllChildrenFromGroup_No_Calculation_or_Group_to_remove,
+                                                                  RingtoetsCommonFormsResources.RemoveAllIcon,
+                                                                  false);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
+                                                                  RingtoetsCommonFormsResources.Validate_all,
+                                                                  RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate,
+                                                                  RingtoetsCommonFormsResources.ValidateAllIcon,
+                                                                  false);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
+                                                                  RingtoetsCommonFormsResources.Calculate_all,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                                  RingtoetsCommonFormsResources.CalculateAllIcon,
+                                                                  false);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                                                                  RingtoetsCommonFormsResources.Clear_all_output,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                                  RingtoetsCommonFormsResources.ClearIcon,
+                                                                  false);
+                }
+            }
+        }
+
+        [Test]
+        public void ContextMenuStrip_NestedCalculationGroup_CallsContextMenuBuilderMethods()
+        {
+            // Setup
+            var group = new CalculationGroup();
+            var parentGroup = new CalculationGroup();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var groupContext = new StabilityPointStructuresCalculationGroupContext(group,
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
+            var parentGroupContext = new StabilityPointStructuresCalculationGroupContext(parentGroup,
+                                                                                         failureMechanism,
+                                                                                         assessmentSectionMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
+
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+                guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock);
+
+                mocks.ReplayAll();
+
+                // Call
+                info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl);
+            }
+            // Assert
+            // Assert expectancies are called in TearDown()
+        }
+
+        [Test]
+        public void ContextMenuStrip_NestedCalculationGroup_AddCustomItems()
+        {
+            // Setup
+            var group = new CalculationGroup();
+            var parentGroup = new CalculationGroup();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var groupContext = new StabilityPointStructuresCalculationGroupContext(group,
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
+            var parentGroupContext = new StabilityPointStructuresCalculationGroupContext(parentGroup,
+                                                                                         failureMechanism,
+                                                                                         assessmentSectionMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+                guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder);
+
+                mocks.ReplayAll();
+
+                // Call
+                using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl))
+                {
+                    // Assert
+                    Assert.AreEqual(9, menu.Items.Count);
+
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                                  RingtoetsCommonFormsResources.AddFolderIcon);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                                  RingtoetsCommonFormsResources.FailureMechanismIcon);
+
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup,
+                                                                  RingtoetsCommonFormsResources.Validate_all,
+                                                                  RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate,
+                                                                  RingtoetsCommonFormsResources.ValidateAllIcon,
+                                                                  false);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup,
+                                                                  RingtoetsCommonFormsResources.Calculate_all,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                                  RingtoetsCommonFormsResources.CalculateAllIcon,
+                                                                  false);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup,
+                                                                  RingtoetsCommonFormsResources.Clear_all_output,
+                                                                  RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                                  RingtoetsCommonFormsResources.ClearIcon,
+                                                                  false);
+                }
+            }
+        }
+
+        [Test]
+        public void ContextMenuStrip_ClickOnAddGroupItem_AddGroupToCalculationGroupAndNotifyObservers()
+        {
+            // Setup
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+            var group = new CalculationGroup();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var nodeData = new StabilityPointStructuresCalculationGroupContext(group,
+                                                                               failureMechanism,
+                                                                               assessmentSectionMock);
+            var calculationGroup = new CalculationGroup
+            {
+                Name = "Nieuwe map"
+            };
+            var observerMock = mocks.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver());
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
+                guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub<IViewCommands>());
+
+                mocks.ReplayAll();
+
+                group.Children.Add(calculationGroup);
+                nodeData.Attach(observerMock);
+
+                using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
+                {
+                    // Precondition
+                    Assert.AreEqual(1, group.Children.Count);
+
+                    // Call
+                    contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick();
+
+                    // Assert
+                    Assert.AreEqual(2, group.Children.Count);
+                    var newlyAddedItem = group.Children.Last();
+                    Assert.IsInstanceOf<CalculationGroup>(newlyAddedItem);
+                    Assert.AreEqual("Nieuwe map (1)", newlyAddedItem.Name,
+                                    "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
+                }
+            }
+        }
+
+        [Test]
+        public void ContextMenuStrip_ClickOnRemoveAllInGroup_RemovesAllChildren()
+        {
+            // Setup
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var calculation = mocks.Stub<ICalculation>();
+                var group = new CalculationGroup
+                {
+                    Children =
+                    {
+                        calculation
+                    }
+                };
+
+                var failureMechanism = new StabilityPointStructuresFailureMechanism();
+                var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+                var nodeData = new StabilityPointStructuresCalculationGroupContext(group,
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
+
+                var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+                var viewCommandsMock = mocks.StrictMock<IViewCommands>();
+                viewCommandsMock.Expect(vc => vc.RemoveAllViewsForItem(calculation));
+
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
+                guiMock.Stub(cmp => cmp.ViewCommands).Return(viewCommandsMock);
+
+                mocks.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                DialogBoxHandler = (name, wnd) =>
+                {
+                    var dialog = new MessageBoxTester(wnd);
+                    dialog.ClickOk();
+                };
+
+                using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
+                {
+                    // Call
+                    contextMenu.Items[contextMenuRemoveAllChildrenRootGroupIndex].PerformClick();
+
+                    // Assert
+                    Assert.IsEmpty(group.Children);
+                }
+            }
+        }
+
+        [Test]
+        public void OnNodeRemoved_NestedCalculationGroup_RemoveGroupAndNotifyObservers()
+        {
+            // Setup
+            var observerMock = mocks.StrictMock<IObserver>();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var group = new CalculationGroup();
+            var parentGroup = new CalculationGroup();
+            var nodeData = new StabilityPointStructuresCalculationGroupContext(group,
+                                                                               failureMechanism,
+                                                                               assessmentSectionMock);
+            var parentNodeData = new StabilityPointStructuresCalculationGroupContext(parentGroup,
+                                                                                     failureMechanism,
+                                                                                     assessmentSectionMock);
+
+            observerMock.Expect(o => o.UpdateObserver());
+
+            mocks.ReplayAll();
+
+            parentGroup.Children.Add(group);
+            parentNodeData.Attach(observerMock);
+
+            // Precondition
+            Assert.IsTrue(info.CanRemove(nodeData, parentNodeData));
+
+            // Call
+            info.OnNodeRemoved(nodeData, parentNodeData);
+
+            // Assert
+            CollectionAssert.DoesNotContain(parentGroup.Children, group);
+        }
+
+        public override void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+
+            base.TearDown();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7a813dee8d40d6bcbcf17ded65418e1800360ac1 -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 7a813dee8d40d6bcbcf17ded65418e1800360ac1)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -103,7 +103,7 @@
                 var children = info.ChildNodeObjects(failureMechanismContext).ToArray();
 
                 // Assert
-                Assert.AreEqual(2, children.Length);
+                Assert.AreEqual(3, children.Length);
 
                 var inputsFolder = (CategoryTreeFolder) children[0];
                 Assert.AreEqual("Invoer", inputsFolder.Name);
@@ -116,7 +116,12 @@
                 var commentContext = (CommentContext<ICommentable>) inputsFolder.Contents[1];
                 Assert.AreSame(failureMechanism, commentContext.WrappedData);
 
-                var outputsFolder = (CategoryTreeFolder) children[1];
+                var calculationsFolder = (StabilityPointStructuresCalculationGroupContext)children[1];
+                Assert.AreEqual("Berekeningen", calculationsFolder.WrappedData.Name);
+                Assert.AreSame(failureMechanism.CalculationsGroup, calculationsFolder.WrappedData);
+                Assert.AreSame(failureMechanism, calculationsFolder.FailureMechanism);
+
+                var outputsFolder = (CategoryTreeFolder) children[2];
                 Assert.AreEqual("Oordeel", outputsFolder.Name);
                 Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
                 Assert.AreEqual(1, outputsFolder.Contents.Count);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs
===================================================================
diff -u -re5f4a598d201934e48ab71795fb3b19cb9a960b1 -rfe8e564d0114932ff274b9c4e3066639ae2f02f1
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision e5f4a598d201934e48ab71795fb3b19cb9a960b1)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
@@ -68,9 +68,10 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(2, treeNodeInfos.Length);
+                Assert.AreEqual(3, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresFailureMechanismContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresCalculationGroupContext)));
             }
 
             mocks.VerifyAll();