Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationContextTest.cs
===================================================================
diff -u -re775448bfb8290e43d62340a53a08723bbc035c6 -r04012135e8adf6a03ce2928e047603435c9a186f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationContextTest.cs	(.../GrassCoverErosionInwardsCalculationContextTest.cs)	(revision e775448bfb8290e43d62340a53a08723bbc035c6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationContextTest.cs	(.../GrassCoverErosionInwardsCalculationContextTest.cs)	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -48,9 +48,9 @@
             // Assert
             Assert.IsInstanceOf<GrassCoverErosionInwardsContext<GrassCoverErosionInwardsCalculation>>(context);
             Assert.IsInstanceOf<ICalculationContext<GrassCoverErosionInwardsCalculation, GrassCoverErosionInwardsFailureMechanism>>(context);
-            Assert.AreEqual(calculation, context.WrappedData);
-            Assert.AreEqual(failureMechanism, context.FailureMechanism);
-            Assert.AreEqual(assessmentSectionMock, context.AssessmentSection);
+            Assert.AreSame(calculation, context.WrappedData);
+            Assert.AreSame(failureMechanism, context.FailureMechanism);
+            Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
             mocksRepository.VerifyAll();
         }
     }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsInputContextTest.cs
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r04012135e8adf6a03ce2928e047603435c9a186f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsInputContextTest.cs	(.../GrassCoverErosionInwardsInputContextTest.cs)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsInputContextTest.cs	(.../GrassCoverErosionInwardsInputContextTest.cs)	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -58,10 +58,10 @@
 
             // Assert
             Assert.IsInstanceOf<GrassCoverErosionInwardsContext<GrassCoverErosionInwardsInput>>(context);
-            Assert.AreEqual(input, context.WrappedData);
-            Assert.AreEqual(calculation, context.Calculation);
-            Assert.AreEqual(failureMechanism, context.FailureMechanism);
-            Assert.AreEqual(assessmentSectionMock, context.AssessmentSection);
+            Assert.AreSame(input, context.WrappedData);
+            Assert.AreSame(calculation, context.Calculation);
+            Assert.AreSame(failureMechanism, context.FailureMechanism);
+            Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
             mocksRepository.VerifyAll();
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -r04012135e8adf6a03ce2928e047603435c9a186f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision ae14c5d4e4624fa87390e6d63bb419c648e12dda)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -220,8 +220,6 @@
             TestName = "ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(MacrostabilityInwardsFailureMechanismSectionResult)")]
         [TestCase(typeof(MacrostabilityOutwardsFailureMechanismSectionResult),
             TestName = "ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(MacrostabilityOutwardsFailureMechanismSectionResult)")]
-        [TestCase(typeof(StabilityPointStructuresFailureMechanismSectionResult),
-            TestName = "ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(StabilityPointStructuresFailureMechanismSectionResult)")]
         public void ChildNodeObjects_FailureMechanismIsRelevant_OutputNodeAddedForResult(Type t)
         {
             // Delegate actual test
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -0,0 +1,49 @@
+// 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.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="StabilityPointStructuresCalculation"/>
+    /// in order to prepare it for performing a calculation.
+    /// </summary>
+    public class StabilityPointStructuresCalculationContext : StabilityPointStructuresContext<StabilityPointStructuresCalculation>,
+                                                              ICalculationContext<StabilityPointStructuresCalculation,
+                                                                  StabilityPointStructuresFailureMechanism>
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="StabilityPointStructuresCalculationContext"/>.
+        /// </summary>
+        /// <param name="calculation">The <see cref="StabilityPointStructuresCalculation"/> 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 calculation belongs to.</param>
+        /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
+        public StabilityPointStructuresCalculationContext(StabilityPointStructuresCalculation calculation,
+                                                          StabilityPointStructuresFailureMechanism failureMechanism,
+                                                          IAssessmentSection assessmentSection)
+            : base(calculation, failureMechanism, assessmentSection) {}
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -0,0 +1,61 @@
+// 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.StabilityPointStructures.Data;
+
+namespace Ringtoets.StabilityPointStructures.Forms.PresentationObjects
+{
+    /// <summary>
+    /// Presentation object for all data required to configure an instance of <see cref="StabilityPointStructuresInput"/>
+    /// in order to be able to configure stability point structures calculations.
+    /// </summary>
+    public class StabilityPointStructuresInputContext : StabilityPointStructuresContext<StabilityPointStructuresInput>
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="StabilityPointStructuresInputContext"/>.
+        /// </summary>
+        /// <param name="input">The stability point structures input instance wrapped by this context object.</param>
+        /// <param name="calculation">The calculation item which the <paramref name="input"/> belongs to.</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 StabilityPointStructuresInputContext(StabilityPointStructuresInput input,
+                                                    StabilityPointStructuresCalculation calculation,
+                                                    StabilityPointStructuresFailureMechanism failureMechanism,
+                                                    IAssessmentSection assessmentSection)
+            : base(input, failureMechanism, assessmentSection)
+        {
+            if (calculation == null)
+            {
+                throw new ArgumentNullException("calculation");
+            }
+
+            Calculation = calculation;
+        }
+
+        /// <summary>
+        /// Gets the calculation item which the context belongs to.
+        /// </summary>
+        public StabilityPointStructuresCalculation Calculation { get; private set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Ringtoets.StabilityPointStructures.Forms.csproj
===================================================================
diff -u -rfe8e564d0114932ff274b9c4e3066639ae2f02f1 -r04012135e8adf6a03ce2928e047603435c9a186f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Ringtoets.StabilityPointStructures.Forms.csproj	(.../Ringtoets.StabilityPointStructures.Forms.csproj)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Ringtoets.StabilityPointStructures.Forms.csproj	(.../Ringtoets.StabilityPointStructures.Forms.csproj)	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -40,9 +40,11 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="PresentationObjects\StabilityPointStructuresCalculationContext.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresCalculationGroupContext.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresContext.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresFailureMechanismContext.cs" />
+    <Compile Include="PresentationObjects\StabilityPointStructuresInputContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Views\StabilityPointStructuresFailureMechanismResultView.cs">
       <SubType>UserControl</SubType>
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Ringtoets.StabilityPointStructures.Plugin.csproj
===================================================================
diff -u -rfe8e564d0114932ff274b9c4e3066639ae2f02f1 -r04012135e8adf6a03ce2928e047603435c9a186f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Ringtoets.StabilityPointStructures.Plugin.csproj	(.../Ringtoets.StabilityPointStructures.Plugin.csproj)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Ringtoets.StabilityPointStructures.Plugin.csproj	(.../Ringtoets.StabilityPointStructures.Plugin.csproj)	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -85,6 +85,21 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
+      <Project>{d951d6da-fe83-4920-9fdb-63bf96480b54}</Project>
+      <Name>Ringtoets.Common.Service</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="..\..\..\HydraRing\src\Ringtoets.HydraRing.IO\Ringtoets.HydraRing.IO.csproj">
+      <Project>{B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70}</Project>
+      <Name>Ringtoets.HydraRing.IO</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/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r0c5413891f455d0884393e14f8afea6b2625b72e -r04012135e8adf6a03ce2928e047603435c9a186f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 0c5413891f455d0884393e14f8afea6b2625b72e)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -29,15 +29,18 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
+using Ringtoets.HydraRing.IO;
 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;
+using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
 
 namespace Ringtoets.StabilityPointStructures.Plugin
 {
@@ -85,8 +88,54 @@
                 CalculationGroupContextChildNodeObjects,
                 CalculationGroupContextContextMenuStrip,
                 CalculationGroupContextOnNodeRemoved);
+
+            yield return RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo<StabilityPointStructuresCalculationContext>(
+                CalculationContextChildNodeObjects,
+                CalculationContextContextMenuStrip,
+                CalculationContextOnNodeRemoved);
+
+            yield return new TreeNodeInfo<StabilityPointStructuresInputContext>
+            {
+                Text = inputContext => RingtoetsCommonFormsResources.Calculation_Input,
+                Image = inputContext => RingtoetsCommonFormsResources.GenericInputOutputIcon,
+                ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
+                                                                                 .AddOpenItem()
+                                                                                 .AddSeparator()
+                                                                                 .AddPropertiesItem()
+                                                                                 .Build()
+            };
+
+            yield return new TreeNodeInfo<StabilityPointStructuresOutput>
+            {
+                Text = output => RingtoetsCommonFormsResources.CalculationOutput_DisplayName,
+                Image = output => RingtoetsCommonFormsResources.GeneralOutputIcon,
+                ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
+                                                                                 .AddPropertiesItem()
+                                                                                 .Build()
+            };
         }
 
+        private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection, StabilityPointStructuresFailureMechanism failureMechanism)
+        {
+            if (!failureMechanism.Sections.Any())
+            {
+                return RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported;
+            }
+
+            if (assessmentSection.HydraulicBoundaryDatabase == null)
+            {
+                return RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported;
+            }
+
+            var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath);
+            if (!string.IsNullOrEmpty(validationProblem))
+            {
+                return string.Format(RingtoetsCommonServiceResources.Hydraulic_boundary_database_connection_failed_0_, validationProblem);
+            }
+
+            return null;
+        }
+
         #region ViewInfo
 
         #region StabilityPointStructuresFailureMechanismResultView ViewInfo
@@ -160,7 +209,7 @@
 
             return builder.AddToggleRelevancyOfFailureMechanismItem(failureMechanismContext, RemoveAllViewsForItem)
                           .AddSeparator()
-                          .AddValidateAllCalculationsInFailureMechanismItem(failureMechanismContext,null)
+                          .AddValidateAllCalculationsInFailureMechanismItem(failureMechanismContext, null)
                           .AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null)
                           .AddClearAllCalculationOutputInFailureMechanismItem(failureMechanismContext.WrappedData)
                           .AddSeparator()
@@ -197,9 +246,17 @@
 
             foreach (ICalculationBase calculationItem in context.WrappedData.Children)
             {
+                var calculation = calculationItem as StabilityPointStructuresCalculation;
                 var group = calculationItem as CalculationGroup;
-                if (group != null)
+
+                if (calculation != null)
                 {
+                    childNodeObjects.Add(new StabilityPointStructuresCalculationContext(calculation,
+                                                                                        context.FailureMechanism,
+                                                                                        context.AssessmentSection));
+                }
+                else if (group != null)
+                {
                     childNodeObjects.Add(new StabilityPointStructuresCalculationGroupContext(group,
                                                                                              context.FailureMechanism,
                                                                                              context.AssessmentSection));
@@ -276,10 +333,83 @@
             parentGroupContext.NotifyObservers();
         }
 
-        private static void AddCalculation(StabilityPointStructuresCalculationGroupContext context) {}
+        private static void AddCalculation(StabilityPointStructuresCalculationGroupContext context)
+        {
+            var calculation = new StabilityPointStructuresCalculation
+            {
+                Name = NamingHelper.GetUniqueName(context.WrappedData.Children, StabilityPointStructuresDataResources.StabilityPointStructuresCalculation_DefaultName, c => c.Name)
+            };
+            context.WrappedData.Children.Add(calculation);
+            context.WrappedData.NotifyObservers();
+        }
 
         #endregion
 
+        #region StabilityPointStructuresCalculationContext TreeNodeInfo
+
+        private static object[] CalculationContextChildNodeObjects(StabilityPointStructuresCalculationContext context)
+        {
+            var childNodes = new List<object>
+            {
+                new CommentContext<ICommentable>(context.WrappedData),
+                new StabilityPointStructuresInputContext(context.WrappedData.InputParameters,
+                                                         context.WrappedData,
+                                                         context.FailureMechanism,
+                                                         context.AssessmentSection)
+            };
+
+            if (context.WrappedData.HasOutput)
+            {
+                childNodes.Add(context.WrappedData.Output);
+            }
+            else
+            {
+                // childNodes.Add(new EmptyProbabilityAssessmentOutput());
+            }
+
+            return childNodes.ToArray();
+        }
+
+        private ContextMenuStrip CalculationContextContextMenuStrip(StabilityPointStructuresCalculationContext context, object parentData, TreeViewControl treeViewControl)
+        {
+            var builder = new RingtoetsContextMenuBuilder(Gui.Get(context, treeViewControl));
+
+            StabilityPointStructuresCalculation calculation = context.WrappedData;
+
+            return builder.AddValidateCalculationItem(context, delegate { })
+                          .AddPerformCalculationItem(calculation, context, Calculate)
+                          .AddClearCalculationOutputItem(calculation)
+                          .AddSeparator()
+                          .AddRenameItem()
+                          .AddDeleteItem()
+                          .AddSeparator()
+                          .AddExpandAllItem()
+                          .AddCollapseAllItem()
+                          .AddSeparator()
+                          .AddPropertiesItem()
+                          .Build();
+        }
+
+        private static string ValidateAllDataAvailableAndGetErrorMessageForCalculation(StabilityPointStructuresCalculationContext context)
+        {
+            return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism);
+        }
+
+        private void Calculate(StabilityPointStructuresCalculation calculation, StabilityPointStructuresCalculationContext context) {}
+
+        private void CalculationContextOnNodeRemoved(StabilityPointStructuresCalculationContext context, object parentData)
+        {
+            var calculationGroupContext = parentData as StabilityPointStructuresCalculationGroupContext;
+            if (calculationGroupContext != null)
+            {
+                calculationGroupContext.WrappedData.Children.Remove(context.WrappedData);
+                //AssignUnassignCalculations.Delete(context.FailureMechanism.SectionResults, context.WrappedData, context.FailureMechanism.Calculations.OfType<StabilityPointStructuresCalculation>());
+                calculationGroupContext.NotifyObservers();
+            }
+        }
+
         #endregion
+
+        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -0,0 +1,57 @@
+// 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.Forms.PresentationObjects;
+using Ringtoets.StabilityPointStructures.Data;
+using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
+
+namespace Ringtoets.StabilityPointStructures.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class StabilityPointStructuresCalculationContextTest
+    {
+        [Test]
+        public void ConstructorWithData_Always_ExpectedPropertiesSet()
+        {
+            // Setup
+            var mocksRepository = new MockRepository();
+            var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
+            mocksRepository.ReplayAll();
+
+            var calculation = new StabilityPointStructuresCalculation();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+
+            // Call
+            var context = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
+
+            // Assert
+            Assert.IsInstanceOf<StabilityPointStructuresContext<StabilityPointStructuresCalculation>>(context);
+            Assert.IsInstanceOf<ICalculationContext<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>>(context);
+            Assert.AreSame(calculation, context.WrappedData);
+            Assert.AreSame(failureMechanism, context.FailureMechanism);
+            Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
+            mocksRepository.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -0,0 +1,83 @@
+// 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 NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.StabilityPointStructures.Data;
+using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
+
+namespace Ringtoets.StabilityPointStructures.Forms.Test.PresentationObjects
+{
+    public class StabilityPointStructuresInputContextTest
+    {
+        private MockRepository mocksRepository;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocksRepository = new MockRepository();
+        }
+
+        [Test]
+        public void ConstructorWithData_Always_ExpectedPropertiesSet()
+        {
+            // Setup
+            var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
+            mocksRepository.ReplayAll();
+
+            var input = new StabilityPointStructuresInput();
+            var calculation = new StabilityPointStructuresCalculation();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+
+            // Call
+            var context = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, assessmentSectionMock);
+
+            // Assert
+            Assert.IsInstanceOf<StabilityPointStructuresContext<StabilityPointStructuresInput>>(context);
+            Assert.AreSame(input, context.WrappedData);
+            Assert.AreSame(calculation, context.Calculation);
+            Assert.AreSame(failureMechanism, context.FailureMechanism);
+            Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
+            mocksRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Constructor_NullCalculation_ThrowsArgumentNullException()
+        {
+            // Setup
+            var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
+            mocksRepository.ReplayAll();
+
+            var input = new StabilityPointStructuresInput();
+            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+
+            // Call
+            TestDelegate test = () => new StabilityPointStructuresInputContext(input, null, failureMechanism, assessmentSectionMock);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("calculation", paramName);
+            mocksRepository.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj
===================================================================
diff -u -rfe8e564d0114932ff274b9c4e3066639ae2f02f1 -r04012135e8adf6a03ce2928e047603435c9a186f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj	(.../Ringtoets.StabilityPointStructures.Forms.Test.csproj)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Ringtoets.StabilityPointStructures.Forms.Test.csproj	(.../Ringtoets.StabilityPointStructures.Forms.Test.csproj)	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -57,9 +57,11 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="PresentationObjects\StabilityPointStructuresCalculationContextTest.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresCalculationGroupContextTest.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresContextTest.cs" />
     <Compile Include="PresentationObjects\StabilityPointStructuresFailureMechanismContextTest.cs" />
+    <Compile Include="PresentationObjects\StabilityPointStructuresInputContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TreeNodeInfos\StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs" />
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs
===================================================================
diff -u -rfe8e564d0114932ff274b9c4e3066639ae2f02f1 -r04012135e8adf6a03ce2928e047603435c9a186f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision fe8e564d0114932ff274b9c4e3066639ae2f02f1)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
@@ -68,10 +68,13 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(3, treeNodeInfos.Length);
+                Assert.AreEqual(6, 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)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresCalculationContext)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresInputContext)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StabilityPointStructuresOutput)));
             }
 
             mocks.VerifyAll();