Adding comments for TODO items

[skip ci]