Updated all files with more todos