diff --git a/multiple-cursors.el b/multiple-cursors.el
index c069d1e..6cd6ad5 100644
--- a/multiple-cursors.el
+++ b/multiple-cursors.el
@@ -110,17 +110,6 @@ highlights the entire width of the window."
     (overlay-put overlay 'type 'additional-region)
     overlay))
 
-;; TODO:
-;; (set-marker MARKER nil) for performance
-;; collapse cursors at same point
-;; remove mark-multiple integration
-;; C-g fjerner regions først, før den disabler multiple-cursors
-;; refactor and add tests :-P
-
-;; ALSO:
-;; unknown:
-;;    (t)ry all or (i)gnore -> (did that work ok? (k)eep doing that or (d)on't)
-
 (defun mc/add-cursor-at-point ()
   "Add a fake cursor where point is.
 Also makes a copy of the kill-ring to be used by this cursor."
diff --git a/todo.org b/todo.org
new file mode 100644
index 0000000..86b2b8e
--- /dev/null
+++ b/todo.org
@@ -0,0 +1,10 @@
+* TODO: [2/8]
+** DONE (set-marker MARKER nil) for performance
+** DONE C-g deactivates regions first, before disabling multiple-cursors
+** TODO remove mark-multiple integration
+** TODO refactor
+   an object with all the current state, used for both overlays and current
+** TODO add tests
+** TODO more state to save per cursor: er/history
+** TODO collapse cursors at same point
+** TODO unknown command: (t)ry all or (i)gnore -> (did that work ok? (k)eep doing that or (d)on't)