Added TO DO comments