diff --git a/TODO.md b/TODO.md
index 60faddb..ec19bd3 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,16 +3,21 @@
 - [x] Add team manager
 - [x] Add site manager
 - [x] Add site list
-- [ ] FIXME Isolate public routes from ensureLoggedIn
+- [x] Isolate public routes from ensureLoggedIn - done by using jsonrpc
 - [x] Add `Comments` component
 - [ ] Add tests for site manager
 - [ ] Fix React SSR error handling
 - [ ] Add React error boundaries
 - [ ] Use strings as ids for big decimals
-- [ ] Integrate Google login
-- [ ] Improve documentation
-
-- <strike>[ ] Add IOC</strike>
+- [ ] Integrate Google (and other social fb/twitter) logins
+- [ ] Framewor development
+  - [ ] Improve comments
+  - [ ] Generate docs using using `typedoc`
+  - [ ] Generate framework website using Docusaurus
+  - [ ] Split framework projects and actual projects
+- [ ] Experiment with styled components
+- [ ] Replace tslint with eslint:
+  https://github.com/typescript-eslint/typescript-eslint
 
 # JSONRPC
 
@@ -20,7 +25,7 @@
 - [x] Make it easy to create actions and reducers based on JSONRPC method
   sigatures
 - [x] Refactor part of functionality as POC
-- [ ] Refactor comments projects to only use JSONRPC
+- [x] Refactor comments projects to only use JSONRPC
 
 # ORM
 
@@ -29,7 +34,14 @@
 
 # Tests
 
-- [ ] Figure out a way to make server-side tests execute successfully without
+- [x] Figure out a way to make server-side tests execute successfully without
+
   `--runInBand`
+  Done by using unique user ids per jest thread, using the
+  `process.env.JEST_WORKER_ID` variable on the mysql projects.
+
+  The `server/` tests run migrations at the beginning and each jest worker
+  creates a new in-memory SQLite database because TypeORM will not allow
+  multiple (queued) transactions - it only uses a single SQLite connection.
 
 # Issues
diff --git a/packages/server/TODO.md b/packages/server/TODO.md
deleted file mode 100644
index f061a7a..0000000
--- a/packages/server/TODO.md
+++ /dev/null
@@ -1 +0,0 @@
-- [ ] Try out styled-components