diff --git a/TODO.md b/TODO.md
index bcb4b89..c3a9bf9 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,3 +7,32 @@ This is the todo file:
 * Scan the sheets with the gui and database tasks and upload (Ulrich)
 
 * Write a howto "GITHUB"
+
+## GENERAL
+* Implement: RFID reading
+* Design: 3D-printable case
+* Write a backup script for the database
+
+## GUI
+* Implement: Error panel when user.isblack (now redirected to start page without error)
+* Implement: Panel showing the ID of an unregistered RFID tag
+* Improve design
+
+## WEB-INTERFACE
+* Improve design
+
+## BARON
+* Implement: Write a function that calculates money owed (per product?) for a user
+* Fix: Show money owed in the table containing the users
+* Implement: Generate a file containing users & money owed
+* Implement: The possibility to automatically send mails to users
+
+## USERS
+* Implement: Show them a list of their consumptions
+* Implement: Show them the money they owe and payment infos
+* Implement: Give them a option to black-out themselves
+
+## PLOTS
+* Implement: Generate plots in a seperate thread (may take some time with many consumptions)
+* Implement: Regerate plots if missing for some reason
+* Fix: Obey isshown flags for users and products in the plots