diff --git a/ideas.md b/ideas.md
index bac741d..ddb768b 100644
--- a/ideas.md
+++ b/ideas.md
@@ -7,42 +7,4 @@
 1. Maybe make sidebar tabbed 3-4 tabs at the top?
 2. Allow child elements on hover (for content navigation only?!)
 3. Mark links as dynamic request
-4. Create l6 and l7 for navigation elements
 
-## Accounting
-1. Sales receipt transfer
-2. Purchase receipt transfer
-3. Cost Center
-    * List (Range)
-    * View
-4. Cost Object
-    * List (Range)
-    * View
-5. Single-Entry Accounting
-    * List
-    * Create
-6. Double-Entry Accounting
-    * List
-    * Create
-7. Balance
-    1. Monthly
-        * Create
-        * Show
-    2. Quarterly
-        * Create
-        * Show
-    3. Yearly
-        * Create
-        * Show
-
-## Production
-1. Status
-2. Create Process
-
-## Marketing
-1. Sales analysis
-2. 
-
-## Human Resources
-1. Clocking
-2. Payroll
diff --git a/todo.md b/todo.md
new file mode 100644
index 0000000..f00d5db
--- /dev/null
+++ b/todo.md
@@ -0,0 +1,71 @@
+# Framework
+
+## Button injection
+
+- [ ] Fix button injection (e.g. report export to excel)
+
+## ModuleFactory, ModuleManager & Dispatcher
+
+- [ ] Don't store modules in every class put them only in one and share them? Dispatcher may need them?
+
+## Datamapper
+
+- [ ] Cleanup
+- [ ] Newest should support limit and return array
+
+## QueryBuilder & Grammar
+
+- [ ] Implement joins
+
+# Modules
+
+## Business
+
+- [ ] Fix positions
+- [ ] Rename to Organization
+- [ ] Maybe make Departments, Units, Positions as madules???
+
+## Production
+
+- [ ] Add articles view (list & create)
+
+## Tasks
+
+- [ ] Adjust Tasks tables
+- [ ] Create datamapper
+- [ ] Tasks should support cron like schedules?!
+
+## PersonnelTimeManagement
+
+- [ ] Adjust tables
+- [ ] Create datamapper
+ 
+## Charts
+
+### Charts types
+
+- [ ] Pie Chart
+- [ ] Area Chart
+- [ ] Stacked Chart
+- [ ] Mixed Chart
+- [ ] Bar Chart
+- [ ] Column Chart
+- [ ] Bubble Chart
+
+### Features
+- [ ] Create chart based on settings
+- [ ] Auto-resize chart (careful there are different types of resizes, not all need to result in a window resize)
+
+## Reporter
+
+- [ ] Newest should be overwritten in Reporter mapper (newest by template)
+
+# Tests
+
+- [ ] Implement code coverage with xdebug
+
+## Framework
+
+- [ ] Create Math test
+- [ ] Model test
+- [ ] Module test