[Incomplete] Add shortcodes