diff --git a/e107_core/templates/contact_template.php b/e107_core/templates/contact_template.php
index 95fa13dcc..52a20bfdc 100644
--- a/e107_core/templates/contact_template.php
+++ b/e107_core/templates/contact_template.php
@@ -17,17 +17,6 @@ if(!isset($CONTACT_INFO))
 	</table>";
 }
 
-$sc_style['CONTACT_EMAIL_COPY']['pre'] = "<tr><td>";
-$sc_style['CONTACT_EMAIL_COPY']['post'] = LANCONTACT_07."</td></tr>";
-
-$sc_style['CONTACT_PERSON']['pre'] = "<tr><td>".LANCONTACT_14."<br />   ";
-$sc_style['CONTACT_PERSON']['post'] = "</td></tr>";
-
-$sc_style['CONTACT_IMAGECODE']['pre'] = "<tr><td>".LANCONTACT_16."<br />";
-$sc_style['CONTACT_IMAGECODE']['post'] = "";
-
-$sc_style['CONTACT_IMAGECODE_INPUT']['pre'] = "";
-$sc_style['CONTACT_IMAGECODE_INPUT']['post'] = "</td></tr>";
 
 
 
@@ -50,11 +39,34 @@ $CONTACT_TEMPLATE['menu'] =  '
 	</div>       
  ';
  
+ 
+ ///XXX This..... 
+ 
+	$sc_style['CONTACT_EMAIL_COPY']['pre'] = "<tr><td>";
+	$sc_style['CONTACT_EMAIL_COPY']['post'] = LANCONTACT_07."</td></tr>";
+	
+	$sc_style['CONTACT_PERSON']['pre'] = "<tr><td>".LANCONTACT_14."<br />   ";
+	$sc_style['CONTACT_PERSON']['post'] = "</td></tr>";
+	
+	$sc_style['CONTACT_IMAGECODE']['pre'] = "<tr><td>".LANCONTACT_16."<br />";
+	$sc_style['CONTACT_IMAGECODE']['post'] = "";
+	
+	$sc_style['CONTACT_IMAGECODE_INPUT']['pre'] = "";
+	$sc_style['CONTACT_IMAGECODE_INPUT']['post'] = "</td></tr>";
+ 
+ 	
+//XXX Becomes This.....  ( New Format for v2 - losing the pre/post and using a shortcode 'wildcard' that can be split later)
+
+	$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE'] 			= "<tr><td>".LANCONTACT_16."<br />{---}";
+	$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE_INPUT'] 	= "{---}</td></tr>";
+	
+	$CONTACT_WRAPPER['form']['CONTACT_EMAIL_COPY'] 			= "<tr><td>{---}".LANCONTACT_07."</td></tr>";
+	$CONTACT_WRAPPER['form']['CONTACT_PERSON']				= "<tr><td>".LANCONTACT_14."<br />{---}</td></tr>";
 
 
-  $CONTACT_TEMPLATE['form'] = "
+	$CONTACT_TEMPLATE['form'] = "
 	<form action='".e_SELF."' method='post' id='contactForm' >
-	<table style='".USER_WIDTH."' cellpadding='1' cellspacing='7'>
+	<table class='table' style='".USER_WIDTH."' cellpadding='1' cellspacing='7'>
 	{CONTACT_PERSON}
 	<tr><td>".LANCONTACT_03."<br />
 	{CONTACT_NAME}
@@ -83,4 +95,4 @@ $CONTACT_TEMPLATE['menu'] =  '
 		
 	
 
-?>
+?>
\ No newline at end of file
diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index 7714361ee..9ee67f0bd 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -1106,6 +1106,8 @@ class e_shortcode
 	
 	protected $mode = 'view'; // or edit. Used within shortcodes for form elements vs values only.   
 
+	protected $wrapper = array(); // hold values of pre/post styling for each shortcode - see contact_template.php for an example. 	
+	
 	/**
 	 * Storage for shortcode values
 	 * @var e_vars