Adding TODO notes

[skip ci]