Initial commit
Fix gs shortcode
Fixing gs issue, reverts gs to previous behavior.
Pulling in.