Added some things to the TODO list