updated TODO.. again (oops.. again!)