diff --git a/doc/todo.txt b/doc/todo.txt
new file mode 100644
index 0000000..f45df46
--- /dev/null
+++ b/doc/todo.txt
@@ -0,0 +1,14 @@
+(B) Create '--clean-build' build option. When present it must delete all module's .o files. +Build
+(B) Implement the cmd tool's man command. It will print at stdout (by using less or more) 'doc/MANUAL.txt'. +NewFeature
+(A) Introduce the usage of soft tokens. The sequence of those tokens will be dictated in '--soft-token' option. +NewFeature
+(D) Introduce the usage of hard tokens. +DevelReverie,+NewFeature
+(C) Tidy up cmd/tests/main.c:blackcat_poking_tests by turning it into smaller system tests. +Tests
+(B) Make net command's system tests also available in NetBSD, FreeBSD and OpenBSD. +Tests
+(C) Add elliptic curve cryptography support (ECDH and ECDSA) in net command. +NewFeature
+(Z) What about roll and unroll commands? +DevelReverie
+(B) Tuning up the build for MINIX (I find it will be pretty easy since MINIX's environment is almost like NetBSD). +Build
+(B) Replace sprintf by snprintf and strcat by strncat where/when possible. +CodeSanitization
+(Z) Extend net protection. +NewFeature
+(E) Improve/implement disabling/enabling/cleaning shell history where it is not currently available. +Improvement,+NewFeature
+(D) Make net tests less magical timeouts dependent. Let's make it more stable. +Improvement,+Tests
+(B) Make any option passed to a cipher (when a byte buffer) also able to read esc\x61ped chars. +Improvement