diff --git a/TODO b/TODO
index 84bbc231756e5d637ad5f7b26db46fa435a60775..46966ff3acf79de122b97d83463d43f1eb211c16 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,19 @@
 TODO file (? means the feature may be implemented, but not definitely)
 -----------------------------------------------------------------------------
 
+Current Version:
 - Implement Spelling [DONE, mostly...]
 - Implement Help [DONE]
 - Internationalization [In progress, translators welcome!]
 - Allow nano to be resized in X. [DONE]
-- Color syntax highlighting? (certainly seems like there's a demand for it.)
 - On page up/down, put the cursor on the first line (like Pico), not the
   center line [DONE]
+- Rewrite edit_refresh, if at all possible [DONE]
+- Implement justify function [DONE]
+- Cut to end of line
+
+For Next Version:
 - Undo/Redo key?
 - single line scroll up/down?
-- Rewrite edit_refresh, if at all possible [In progress]
-- Implement justify function [DONE]
+- Color syntax highlighting? (certainly seems like there's a demand for it.)
+- .nanorc ?????