Added some things to TODO list