diff --git a/general_rules/Scenario.tex b/general_rules/Scenario.tex
index 9cae4ee9..f571a9c9 100644
--- a/general_rules/Scenario.tex
+++ b/general_rules/Scenario.tex
@@ -56,8 +56,9 @@ \subsection{Furniture}
 	\item a couch,
 	\item a small table,
 	\item a small dinner table with two chairs,
-	\item an open cupboard or small table with a television and remote control, and
-	\item a cupboard or shelf with doors and some books inside,
+	\item an open cupboard or small table with a television and remote control,
+	\item a cupboard with drawers, and
+	\item a bookcase or shelf with doors and some books inside
 \end{itemize}
 
 Likewise the arena's kitchen must have:
@@ -79,6 +80,26 @@ \subsection{Furniture}
 \end{figure}
 
 
+\subsubsection{Cupboard}
+The cupboard can be any shelf-like furniture in which objects can be placed.
+\begin{itemize}
+	\item[\textbf{Doors:}] The cupboard may have doors.
+	\item[\textbf{Drawers:}] The cupboard must have at least two drawers betweem 90cm and 120cm from floor level.
+	\item[\textbf{Shelves:}] The minimum distance between shelf or layers is 30cm.
+\end{itemize}
+
+\subsubsection{Shelf}
+A shelf, rack, or bookcase is required in RoboCup@Home.
+The shelf can be any shelf-like furniture in which objects can be placed.
+\begin{itemize}
+	\item[\textbf{Doors:}] The shelf must have at least one door (preferrably a vertical one) covering up to one half of it.
+	\item[\textbf{Drawers:}] The shelf must have no drawers.
+	\item[\textbf{Shelves:}] The shelf must have 5 shelves or layers between 0.0m and 1.80m from the ground, with a minimum distance of 30cm between shelves or layers.
+\end{itemize}
+
+\subsubsection{Fridge}
+Fridges must not be smaller than 120m. At least one powered and functioning fridge is required.
+
 
 \subsection{Changes to the arena}
 \label{rule:scenario_changes}
diff --git a/images/storing_groceries.png b/images/storing_groceries.png
deleted file mode 100644
index 08ffef7c..00000000
Binary files a/images/storing_groceries.png and /dev/null differ
diff --git a/tasks/StoringGroceries.tex b/tasks/StoringGroceries.tex
new file mode 100644
index 00000000..73464059
--- /dev/null
+++ b/tasks/StoringGroceries.tex
@@ -0,0 +1,89 @@
+\section{Storing Groceries [House Holder]}
+The robot stores groceries into the shelf next to the objects of the same kind that are already there (e.g. for instance by placing apples near pears and bananas).
+
+% \subsection{Focus}
+% This test focuses on the detection and recognition of objects and their features, as well as object manipulation.
+
+\subsection{Main Goal}
+The robot has to move 5 out of 10 objects from a nearby table into the shelf. Placed objects must be placed next to objects of the same Category or grouped by similarity.
+
+\noindent\textbf{Reward:} 500pts\\
+
+\noindent\textbf{HINT:} The robot can ask the referee where to place the carried object (relative positions or pointing are both allowed).
+
+\subsection{Bonus rewards}
+\begin{enumerate}[nosep]
+	\item Opening the shelf door (300pts)
+	\item Moving a \emph{tiny} object (100pts)
+	\item Moving a \emph{heavy} object (100pts)
+\end{enumerate}
+
+% %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Setup
+%
+% %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{Setup}
+\begin{enumerate}
+	\item \textbf{Location:} The testing area has a shelf and a table.
+	The distance between the Table and the Shelf cannot exceed 2 meters.
+
+	\item \textbf{Shelf:} The shelf contains at least 10 objects arranged in groups of 2 or more, either by category or likeliness.
+	The shelf has at least one free space for starting a new set.
+
+	\item \textbf{Shelf door:} The shelf door is open by default.
+	The team leader can, request the door to be closed and score additional points for opening it. If the robot fails to open the door, it must clearly state it and request the referee to open it.
+
+	\item \textbf{Objects:} Some of the objects are placed behind the door and cannot be accessed unless the door is open.
+
+	\item \textbf{Table:} The table can have up to 10 objects, but never less than 5.
+	In small tables, objects will be added as the robot frees up space.
+\end{enumerate}
+
+
+% %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Additional Rules
+%
+% %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{Additional rules and remarks}
+\begin{enumerate}
+	\item \textbf{Clear area:} The robot may assume that the working area is clear, (i.e. can move slightly backwards for its task).
+
+	\item \textbf{Object distribution:} The 10 objects to be moved are evenly distributed in random fashion including
+	4 known objects,
+	4 alike objects, and
+	2 unknown objects.
+	Among these, the robot will always find
+	a heavy object,
+	a tiny object, and 
+	an amorphous object.
+
+	\item \textbf{Table} The table's rough location will be announced beforehand, having its position either left, right, or behind the robot.
+\end{enumerate}
+
+\newpage
+\subsection{OC instructions}
+
+\textbf{2 hours before the test}
+\begin{itemize}
+	\item Announce which table will be used in the test.
+	\item Announce a rough location for the table.
+\end{itemize}
+
+\subsection{Referee instructions}
+The referee needs to
+\begin{itemize}
+	\item Place the objects in the shelf, grouping them by likeliness.
+	\item Open the door of the shelf.
+	\item Place objects on the table.
+\end{itemize}
+
+
+% \newpage
+% \subsection{Score sheet}
+% \input{scoresheets/StoringGroceries.tex}
+
+% Local Variables:
+% TeX-master: "Rulebook"
+% End: