Added some new ideas to TODO