Adding top-level TODO items

[skip ci]