Paul's comments
Add to TODO