Adding class description and TODOs