Organized TODO a bit more.