Added some TO DOs