diff --git a/TODO.md b/TODO.md
index 0f338d9..7f589d5 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,21 +1,21 @@
 # TODO.md
 
-- [ ] Cache #TODO @ ([src/extensions/time.py:107](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/time.py#L107))  
+- [ ] re implement #TODO @ ([src/extensions/fun.py:289](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/fun.py#L289))  
+- [ ] fix #TODO @ ([src/extensions/fun.py:447](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/fun.py#L447))  
 - [ ] write code... #TODO @ ([src/extensions/abandoned.py:423](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/abandoned.py#L423))  
 - [ ] write code... #TODO @ ([src/extensions/abandoned.py:429](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/abandoned.py#L429))  
-- [ ] use a better way to get the message count #FIXME @ ([src/extensions/messages.py:218](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/messages.py#L218))  
 - [ ] better formatting #TODO @ ([src/extensions/space.py:91](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/space.py#L91))  
 - [ ] better formatting #TODO @ ([src/extensions/space.py:131](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/space.py#L131))  
-- [ ] use flags #TODO @ ([src/extensions/english.py:56](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/english.py#L56))  
+- [ ] Cache #TODO @ ([src/extensions/time.py:107](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/time.py#L107))  
+- [ ] Add subcommands #TODO @ ([src/extensions/server.py:183](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/server.py#L183))  
 - [ ] Should use 2.0 flags #FIXME @ ([src/extensions/text.py:29](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/text.py#L29))  
 - [ ] I don't know how this works but I need to to make it cleaner #HACK @ ([src/extensions/text.py:291](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/text.py#L291))  
-- [ ] use cache #TODO @ ([src/extensions/events.py:145](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/events.py#L145))  
 - [ ] the db calls need to be fixed #FIXME @ ([src/extensions/tags.py:2](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/tags.py#L2))  
-- [ ] Add subcommands #TODO @ ([src/extensions/server.py:183](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/server.py#L183))  
+- [ ] use a better way to get the message count #FIXME @ ([src/extensions/messages.py:218](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/messages.py#L218))  
 - [ ] there may be a better way to do this #XXX @ ([src/extensions/utility.py:35](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/utility.py#L35))  
 - [ ] this does not work #FIXME @ ([src/extensions/utility.py:116](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/utility.py#L116))  
 - [ ] use discord relative time #FIXME @ ([src/extensions/utility.py:366](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/utility.py#L366))  
 - [ ] use discord relative time #FIXME @ ([src/extensions/utility.py:389](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/utility.py#L389))  
-- [ ] re implement #TODO @ ([src/extensions/fun.py:289](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/fun.py#L289))  
-- [ ] fix #TODO @ ([src/extensions/fun.py:447](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/fun.py#L447))  
+- [ ] use flags #TODO @ ([src/extensions/english.py:56](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/english.py#L56))  
+- [ ] use cache #TODO @ ([src/extensions/events.py:145](https://github.com/wasi-master/wm_bot/blob/main/src/extensions/events.py#L145))  
 - [ ] Cache #TODO @ ([src/utils/bot.py:152](https://github.com/wasi-master/wm_bot/blob/main/src/utils/bot.py#L152))