this should be moved into the comment library