Addded some comments about what still needs to be done