Some TODOs and some TODONEs