diff --git a/TODO.md b/TODO.md
index 0b174d6..8fd3d1f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,10 +6,7 @@
 - [x] Flag that sets the debug mode
 - [x] Flag to show the version
 - [x] Page versioning in a really basic way
-- [ ] Flag to select store
-- [ ] Config file (to select store and some other future options)
 - [x] Makefile helper
-- [ ] Reload if files changes [idea](https://medium.com/@olebedev/live-code-reloading-for-golang-web-projects-in-19-lines-8b2e8777b1ea#.gok9azrg4)
 - [ ] CI (gofmt, golint, more)?
 
 ## Bootstrap
@@ -18,5 +15,20 @@
 - [x] Sample Model
 - [x] Store interface (gorm, file...)
     - [x] Open db store
-    - [ ] Open file store
 - [x] Templates
+
+## Must
+> Must have things (as tasks)
+- [ ] List history (in every detail page, a link to the history should be included)
+- [ ] Deal with static content (images, attachments...)
+- [ ] If you're about to save not the latest version, button: save -> restore
+- [ ] Delete any page or version
+- [ ] Not allow to create a kind of forbidden-words list (edit, list, version...)
+- [ ] Redirect page/ -> page
+
+## Enhacements
+> Things that would be awesome to have, but not necessary for now
+- [ ] Config file (to select store and some other future options)
+- [ ] Flag to select store
+    - [ ] Open file store
+- [ ] Reload if files changes [idea](https://medium.com/@olebedev/live-code-reloading-for-golang-web-projects-in-19-lines-8b2e8777b1ea#.gok9azrg4)