Refactor the shortcode output, and escape things! #3
Move the shortcode WP_Query about! #3