organized updated TODO