moving comments to TODO