1.0
shortcode functions commented out (temp)