Finish comment functionality. End of Iteration 2