Rearranged TODO a bit