Shortcodes

Signed-off-by: Phil Johnston <johnstonphilip@gmail.com>