Adds a bunch of untested code for abstracting out the shortcode class.