Updated TODO, changed name