TODOs up to date