Update to comment functionality 12-23 @1:12am