comment, comment, comment

first pass on shortcode also