More TODOing around results.