adding [@paulp](github.com/paulp)'s ideas to TODO list.