Updated TODO, loads to do