Old stuff that I don't know how to not commit--will revert
Revert "Taking out attempt at shortcode for function"

This reverts commit 027728d1696dda37054eefe6749c03b858e6c71c.
Revert "Old stuff that I don't know how to not commit--will revert"

This reverts commit 89673e5e217aa462d5a4bbdb30ad60ae111d4544.
Merge remote-tracking branch 'origin/master'