Updated description and added TO DOs