Adding the comments feature