Added more description and TODOs