diff --git a/README.md b/README.md
index 21d55ce..2b9fb71 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,20 @@
 # jon
 
 > the tamer of garfield
+
 ## fsmi-db forward
 
 ```
-ssh -nNTvL 5432:fsmi-db.fsmi.uni-karlsruhe.de:5432 fsmi-login
+ssh -nNTvL 5432:fsmi-db.fsmi.uni-karlsruhe.de:5432 fsmi-login.fsmi.uni-karlsruhe.de
 ```
+
+## TODO
+
+- [ ] Implement item and snack entry as Elm application
+  - [ ] Needs good documentation for maintainability
+- [ ] Implement and document report generation
+  - [ ] How many days will the item last?
+  - [ ] How many do we need to last X months?
+  - [ ] etc.
+  - [ ] Make it print nicely
+- [ ] Make it possible to edit entries
diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index 67803cd..0000000
--- a/TODO.md
+++ /dev/null
@@ -1 +0,0 @@
-- [ ] Fix date handling in entry