diff --git a/src/calibre/srv/TODO.rst b/src/calibre/srv/TODO.rst
index 3fab4e02e3..7607f9eed6 100644
--- a/src/calibre/srv/TODO.rst
+++ b/src/calibre/srv/TODO.rst
@@ -1,2 +1,33 @@
-Fix search completion popups
-Bookmarks/annotations
+Various server related things that I intend to get to soon-ish, in no
+particular order.
+
+
+New features for the in-browser viewer
+----------------------------------------
+
+- Footnote popups
+
+- Bookmarks and more generally, annotations such as highlighting text and
+  adding comments
+
+- When reaching the end of the book, show a popup that allows the user
+  to rate the book and optionally delete it from the local storage.
+
+
+New features for the server generally
+---------------------------------------
+
+- Create a UI for making changes to the library such as editing metadta,
+  adding/deleting books, converting, sending by email, etc.
+
+- Add links to easily search goodread/amazon/google books from the book
+  details page
+
+- Add a way to search the set of locally available books stored in offline
+  storage.
+
+
+Bug fixes
+--------------
+
+- Fix search completion popups in the various search boxes not working