Added some to-dos