Added comment support, may remove if it's not what we're looking for