Adding TODO items

[skip ci]