Improved example, add to TODO