Some more work on the CommentService. Still not done yet.