diff --git a/CHANGELOG.md b/CHANGELOG.md
index f61c788..53be156 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## TODO
 
-- Parse binary operators
+- Parse __more__ binary operators
 - Parse more complex bindings
 - Watch mode
 - Improve error messages
@@ -12,6 +12,22 @@
 - Namespace identifiers in the symbol table
 - Stdlib
 - Document code
+- Watch mode
+- Formatter
+- Simple language server
+
+## v0.0.10
+
+- [ ] Typecheck current AST
+
+## v0.0.9
+
+- [ ] Hand made CLI, remove clap
+- [ ] Compile a single file
+- [ ] Implement code generation for ast nodes implemented as of now
+- [ ] Display error messages during compilation
+- [ ] Improve errro messages
+
 
 
 ## v0.0.8
diff --git a/CLI.md b/CLI.md
new file mode 100644
index 0000000..24646c7
--- /dev/null
+++ b/CLI.md
@@ -0,0 +1,23 @@
+The THP compiler & formatter, v0.0.1
+
+Usage: `thp [command] [options]`
+
+## Commands
+
+c _file_		Compiles `file` in-place
+f _file_		Formats `file`
+r				Starts the REPL
+
+init			Initializes a new project in the current directory
+build, b		Builds the project
+fmt				Formats all files in the project
+watch			Starts compilation of the project in watch mode
+
+
+help, h			Print this message & exit
+
+## General options
+
+-h, --help		Print command-specific usage
+
+