Preliminary work on the Gallery shortcode