diff --git a/documentation/design-documentation/chapters/chapter03.tex b/documentation/design-documentation/chapters/chapter03.tex
index 5be5648f95cfef1800d32aecabf143a6801a9ad4..a7ddfce894baa9adc6cc990115ba5e8806a8635c 100644
--- a/documentation/design-documentation/chapters/chapter03.tex
+++ b/documentation/design-documentation/chapters/chapter03.tex
@@ -8,6 +8,7 @@ Some loose thoughts for this chapter, as data networks consists out of:
 \begin{enumerate}
 	\item interfaces
 	\item links connecting interfaces
+	\item (network elements, or short elements. This comprises all types of devices attached to a network, such as hosts and (optical) switches
 	\item hosts having at least or n interfaces
 	\item hosts with ability to do forwarding decisions, e.g., an IP router on layer 3, an Ethernet-switch on layer 2, or an optical switch on layer 1 (i.e., wavelength)
 	\item differentiation between physical and logical links is needed, as
diff --git a/documentation/design-documentation/chapters/chapter04.tex b/documentation/design-documentation/chapters/chapter04.tex
index dfb34a2b65b67c68f3a0c3185c589e7d6b8e0a7e..fca8a1838e302b9e3222722dc22633b882285416 100644
--- a/documentation/design-documentation/chapters/chapter04.tex
+++ b/documentation/design-documentation/chapters/chapter04.tex
@@ -8,16 +8,23 @@ This section discusses the basic conceptual organization forms for data networks
 
 \subsection{Principal Network Domain (PND)}
 
-Any network consists out of basic components that are the collection of devices (called hosts later on) used to form such particular network. These components, let it be any device attached to this network and the (physical) links, with their control-, data-, and management planes form the Principal Network Domain (PND). A specific network controller is in control of the specific components of a network. 
+Any network consists out of basic components that are the collection of (network) elements used to form such particular network. These components, let it be any device attached to this network and the (physical) links, with their control-, data-, and management planes form the Principal Network Domain (PND). A specific network controller is in control of the specific components of a network. 
 
 The differentiation between the PND and the following definitions of network domain, IP network, etc is important for the design of a network controller that is supervising a network in its whole. The PND is the concept used by the network controller to keep track of all hosts and links associated~\footnote{XXXwhat means \emph{associated} exactly?} to this controller. 
 
+A single controller may be in charge of multiple PNDs. 
+
+\subsection{Network Domain (ND)}
+
+A network domain is the collection of matt
+
+
 \section{Building Blocks}
 \label{ch:conceptual-design:collection}
 
 Some conceptual building blocks for a network supervisor:
 \begin{description}
-	\item [host inventory] \hfill \\ This contains all known hosts, independent their relationship, of the network. This includes their hardware configuration, such as, interfaces attached to a particular host.
+	\item [element inventory] \hfill \\ This contains all known elements (such as end-hosts or network element as optical switches), independent of their relationship, of the network. This includes their hardware configuration, such as, interfaces attached to a particular host.
 	\item [host configuration] \hfill \\  This is based on the information provided by the host inventory and contains the actual operational configuration of the hosts. This will probably contain only the configuration of the network devices, such as, switches and routers, potentially also servers, but not end-hosts.		
 	\item [Network ] \hfill \\ 
 	\item [Network Configuration)] \hfill \\ 
diff --git a/documentation/design-documentation/chapters/chapter05.tex b/documentation/design-documentation/chapters/chapter05.tex
new file mode 100644
index 0000000000000000000000000000000000000000..0fc9cd486cfc2ab3bd49760dd10e11559f70c166
--- /dev/null
+++ b/documentation/design-documentation/chapters/chapter05.tex
@@ -0,0 +1,5 @@
+\chapter{Implementation Aspects of the goSDN Controller}
+\label{ch:implementation-aspects}
+
+\section{Why we do this in go}
+
diff --git a/documentation/design-documentation/thesis.pdf b/documentation/design-documentation/thesis.pdf
index 8fa75339611ec3f8c54c98c122ac7ce751dc1cd2..86edde8b9d113ae0b6a8825b88bdf327929da8df 100644
Binary files a/documentation/design-documentation/thesis.pdf and b/documentation/design-documentation/thesis.pdf differ
diff --git a/documentation/design-documentation/thesis.tex b/documentation/design-documentation/thesis.tex
index 4862328daa44fd0cb07ea15031f63d8aea1a23a0..74a22b2b098dede8cee40c71eb57f0b67a1ca63c 100644
--- a/documentation/design-documentation/thesis.tex
+++ b/documentation/design-documentation/thesis.tex
@@ -95,6 +95,7 @@
 \include{chapters/chapter02}
 \include{chapters/chapter03}
 \include{chapters/chapter04}
+\include{chapters/chapter05}
 %*************************************************************************
 % Backmatter
 %*************************************************************************