diff --git a/doc/plan.org b/doc/plan.org
index e60c6a9..d5fd1ca 100644
--- a/doc/plan.org
+++ b/doc/plan.org
@@ -1,7 +1,13 @@
 * Time table
-| 2019-02-22 | kick-off                  |
-| 2019-02-22 | have all papers handed in |
-| 2019-08-21 | hand in                   |
+| 2019-02-22 | kick-off                                     |
+| 2019-02-22 | have all papers handed in                    |
+| 2019-02-22 | Have rough definition of tasks               |
+| 2019-03-01 | Feature list / priority list / roadmap clear |
+| 2019-03-08 | NAT46 1:1 table TCP/UDP working              |
+| 2019-03-15 | NAT46 1:1 table ICMP, ICMPv6 working         |
+|            |                                              |
+| 2019-08-05 | Latest start writing documentation           |
+| 2019-08-21 | hand in thesis                               |
 * Topics / Tasks
 ** Admin
 *** TODO Create task description to be handed in mystudies
@@ -9,12 +15,35 @@
 *** TODO Create list of tasks / initial brainstorming
 *** TODO Find out how-when-whom-where to meet / define schedule
 *** TODO Latex and/or org-mode for the thesis?
+*** TODO Add initial milestones
+**** 180d plan
+**** 25w
 ** Thesis implementation
 *** TODO Get feature list of jool
 *** TODO Get feature list of tayga
-*** TODO Setup P4 base
-*** DONE Setup test VM: 2a0a:e5c0:2:12:400:f0ff:fea9:c3e3
+*** TODO Setup P4 base / structure
+*** DONE Setup test VM for P4: 2a0a:e5c0:2:12:400:f0ff:fea9:c3e3
+*** TODO Setup test VM [dual stack] for Jool:
+*** TODO Setup test VM [dual stack] for tayga:
+*** NAT64/NAT46 Features in jool and tayga
+**** TODO Static 1:1 NAT46: translate from IPv4 to IPv6 with a table
+***** TCP, UDP
+***** ICMP <-> ICMPv6
+**** TODO Stateless Prefix based NAT64: IPv6 to IPv4 translation prefix based
+***** Allows IPv6 hosts to reach the IPv4 Internet
 ** Thesis documentation
+*** Motivation
+    TBD
+*** Current state of the art tayga/jool
+    TBD
+*** P4 based implementation
+    TBD
+*** Performance comparison
+*** Feature/Functionality difference / overview
+**** Not included
+     - DNS64 - has already been solved in a different domain
+*** References / Follow up
+**** RFC 6052
 * Proposal / task description
 ** Task description for mystudies
 *** High speed NAT64 with P4