Moved todo to individual files.