I really would like the TODOs here, ideally some standardized like `TODO (new permissions)` and make the notes here, there are really many changes going on right now and might be easy to overlook something. It would also make easier for the reviewer to see if that's known to be fixed or not. Especially in things like permissions