Updated the TODO once more