More TODos and some progress