Isolating all shortcode functionality to a single library -- will continue to clean that up, for now, top-level stack works fine