Updated TODO, almost completed an item kind of