Add TODO list
Merge branch 'master' into performance-fixes