diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..0f4b72c
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,6 @@
+- Warning when indexes overlap (data add or update)
+- Data integrity on update (create temporary file with new data, rename old data file, move temporary file, remove old data file)
+- Handle errors (such as permissions) in an explicit way
+- Grooming (create a consistent and convenient API)
+- Improve data search
+- Check for TODOs