diff --git a/README.md b/README.md
index 758f20a..0aa5c93 100644
--- a/README.md
+++ b/README.md
@@ -19,11 +19,9 @@ Requires *CMake* and *wxWidgets*:
     > mkdir ./build && cd ./build
     > cmake ../ && make
 
-## Ongoing development
- - Add support for *.si4* file format
- - Improving user experience
- - Analyze and generate game reports
- - Many more features...
+## Notes
+
+OChess is still in early development stage. For more informations, please read the `TODO.md` file.
 
 ## Satellites projects
 OChess is based on several satellite projects that implement individual and independant features:
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..9b3c11b
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,12 @@
+# TODO
+
+## Before releasing v0.1.0
+ - [ ] In BoardCanvas search for a workaround of the dynamic allocation of adata.buffer (on canvas resize)
+ - [ ] Bind the chess game editor settings to EditorPrefs.hpp
+ 
+ ## Additional Features
+ - [ ] Add a live evaluation bar to the BoardCanvas
+ - [ ] Be able to play against an engine
+ - [ ] Implement full chess engine game analyzer/annotator
+ - [ ] Handle .si4 databases
+ - [ ] Implement a page system for large databases (load massive databases per pages instead of entirely)
\ No newline at end of file