diff --git a/lib/matisse-thesis.typ b/lib/matisse-thesis.typ
index 21c88d3..952455d 100644
--- a/lib/matisse-thesis.typ
+++ b/lib/matisse-thesis.typ
@@ -2,7 +2,7 @@
 
 #import "cover.typ": cover
 #import "abstracts.typ": abstracts
-#import "todos.typ": todos, show-todos
+#import "todos.typ": todos, show-todos, show-notes
 #import "etablissements.typ": *
 
 #let matisse-thesis(
@@ -45,6 +45,7 @@
     todos() 
   } else {
     show-todos.update(false)
+    show-notes.update(false)
   }
 
   // ---------- GENERAL ----------
diff --git a/lib/todos.typ b/lib/todos.typ
index 6be7b6f..f5042bf 100644
--- a/lib/todos.typ
+++ b/lib/todos.typ
@@ -1,5 +1,28 @@
-#let todo-list = state("todo-list",())
+#import "@preview/drafting:0.2.2": inline-note, note-outline, margin-note
+
 #let show-todos = state("show-todos", true)
+#let show-notes = state("show-notes", true)
+
+#let todo(color: red, content) = context {
+  if show-todos.get() {
+    inline-note(par-break: false, stroke: (paint: color, dash: "dashed"))[#text(fill: color)[TODO]: #content]
+  }
+}
+
+#let todos() = context {
+  if show-todos.get()  or show-notes.get() {
+    note-outline()
+  }
+}
+
+#let note(body, dy: auto, ..kwargs) = context {
+  if show-notes.get() {
+    margin-note(body, dy: dy, ..kwargs)
+  }
+}
+
+/*
+#let todo-list = state("todo-list",())
 
 #let todo(color: red, content) = context {
   if show-todos.get() {
@@ -43,3 +66,4 @@
     }
   }
 }
+*/
diff --git a/template/main.typ b/template/main.typ
index b1a0561..8448c82 100644
--- a/template/main.typ
+++ b/template/main.typ
@@ -63,6 +63,8 @@
 
 #todo[Write an introduction]
 
+#note(stroke: aqua + 3pt)[Something to comment about][a note]
+
 #lorem(200)
 
 #figure(