Added some TO DO topics