Extending Shortcodes

Still working in this….