Add more comments to TODO
Add more comments