Commenting and TO DO sections added