Added bulk of commenting functionality