Syncing with the mothership

TODO list revisited.