Add some comments to the TODO