Updated TODO. this is getting repetitive