Added some ideas to TODO