Working on Feature #81

A lot of work towards feature #81
Shortcode is ALMOST working - now having to debug main form generation
class to see why things aren't loading correctly.