Update TODO, hopefully we are closer to reality this time