Added 2 TODO's