Flesh out the shortcode retrieval
Merge branch 'master' of github.com:freejoe76/-