Added a few ideas to TODO