Sdd some TODO's