diff --git a/boilerplates/torque-plugin/README.md b/boilerplates/torque-plugin/README.md
index 551d1a66..b8bcc53f 100644
--- a/boilerplates/torque-plugin/README.md
+++ b/boilerplates/torque-plugin/README.md
@@ -19,7 +19,7 @@
 
 4.  Rename all files in this directory: {torque-plugin}-etc-class.php => {<torque_plugin_slug>}-etc-class.php
 
-5.  Add '<torque_child_theme_slug>' to cli/lib/workspaces.sh
+5.  Add '<torque_plugin_name>' to cli/lib/workspaces.sh
 
 6.  Open new terminal, and in **project** root, run:
 
diff --git a/cli/lib/workspaces.sh b/cli/lib/workspaces.sh
index 02247ad5..651b6454 100644
--- a/cli/lib/workspaces.sh
+++ b/cli/lib/workspaces.sh
@@ -17,4 +17,5 @@ declare -a workspaces=(
   "torque-us-states"
   "torque-residences"
   "torque-services"
+  "torque-contact-form"
 )
diff --git a/plugins/torque-contact-form/.babelrc b/plugins/torque-contact-form/.babelrc
new file mode 100644
index 00000000..481a0aa8
--- /dev/null
+++ b/plugins/torque-contact-form/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": ["react", "env"],
+  "plugins": [
+    "transform-runtime"
+  ]
+}
diff --git a/plugins/torque-contact-form/README.md b/plugins/torque-contact-form/README.md
new file mode 100644
index 00000000..f31a7d38
--- /dev/null
+++ b/plugins/torque-contact-form/README.md
@@ -0,0 +1,23 @@
+# Torque Contact Form
+
+Adds a shortcode for displaying a contact form on pages. The child theme will decide the form fields for now.
+
+## Filters
+
+<!-- prettier-ignore-start -->
+
+*Filter* | *Function* | *Value Type*
+--- | --- | ---
+`'torque_contact_form_fields_filter'` | Allows the child theme control over the form fields, giving the ability to add new ones or hide defaults | Array
+
+<!-- prettier-ignore-end -->
+
+# Changelog
+
+## [1.0.0] 09/26/2018
+
+### Added
+
+- Plugin config
+- All form classes - email, field factory, template and root class
+- Shortcode with tinyMCE
diff --git a/plugins/torque-contact-form/package.json b/plugins/torque-contact-form/package.json
new file mode 100644
index 00000000..a35f6399
--- /dev/null
+++ b/plugins/torque-contact-form/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "torque-contact-form",
+  "version": "1.0.0",
+  "author": "Torque",
+  "license": "ISC",
+  "scripts": {
+    "start": "webpack --mode=development --watch",
+    "build": "webpack --mode=production"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "autoprefixer": "^9.0.2",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.5",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-react": "^6.24.1",
+    "copy-webpack-plugin": "^4.5.2",
+    "css-loader": "^1.0.0",
+    "extract-text-webpack-plugin": "^4.0.0-alpha.0",
+    "file-loader": "^1.1.11",
+    "node-sass": "^4.9.2",
+    "postcss-loader": "^2.1.6",
+    "sass-loader": "^7.1.0",
+    "style-loader": "^0.21.0",
+    "url-loader": "^1.0.1",
+    "webpack": "^4.16.3",
+    "webpack-cli": "^3.1.0"
+  }
+}
diff --git a/plugins/torque-contact-form/src/autoload.php b/plugins/torque-contact-form/src/autoload.php
new file mode 100644
index 00000000..4da7fa2e
--- /dev/null
+++ b/plugins/torque-contact-form/src/autoload.php
@@ -0,0 +1,29 @@
+<?php
+
+require( Torque_Contact_Form_PATH . '/shortcode/torque-contact-form-shortcode-class.php' );
+
+/**
+ * Autoload all other classes
+ */
+class Torque_Contact_Form_Autoloader {
+
+	/**
+	 * empty contructor on purpose.
+	 */
+	function __construct() {}
+
+	/**
+	 * load the classes based on class names passed in array
+	 *
+	 * @param  array $classes the class names to load
+	 * @return void           does not return anything. instantiates the classese only
+	 */
+	public static function autoload( $classes ) {
+
+		foreach ($classes as $class_name) {
+			new $class_name();
+		}
+	}
+}
+
+?>
diff --git a/plugins/torque-contact-form/src/form/form-contact-email.php b/plugins/torque-contact-form/src/form/form-contact-email.php
new file mode 100644
index 00000000..3ddf7c9a
--- /dev/null
+++ b/plugins/torque-contact-form/src/form/form-contact-email.php
@@ -0,0 +1,53 @@
+<?php
+
+class Torque_Contact_Form_Email {
+
+  private $recipient = '';
+
+  private $fields = array();
+
+  public function __construct($recipient, $fields) {
+    $this->recipient = $recipient;
+    $this->fields = $fields;
+  }
+
+  public function send() {
+    // allow html content
+    add_filter( 'wp_mail_content_type', array($this, 'set_html_content_type'));
+
+    $message = $this->create_message();
+    $subject = 'New Message';
+    $headers = array('Content-Type: text/html; charset=UTF-8');
+
+    // send mail
+    wp_mail( $this->recipient, $subject, $message, $headers );
+
+    // remove html filter to avoid conflicts
+    remove_filter( 'wp_mail_content_type', array($this, 'set_html_content_type'));
+  }
+
+  /**
+   * We need this as a separate function so we can remove the filter too
+   */
+  public function set_html_content_type() {
+    return 'text/html';
+  }
+
+  private function create_message() {
+    ob_start();
+    ?>
+
+    <h1>New Message</h1>
+
+    <?php
+    foreach ($this->fields as $id => $options) {
+    ?>
+      <p><?php echo $options['name']; ?>: <?php echo $_POST[$id]; ?></p>
+    <?php
+    }
+
+    return ob_get_clean();
+  }
+}
+
+?>
diff --git a/plugins/torque-contact-form/src/form/form-contact-field.php b/plugins/torque-contact-form/src/form/form-contact-field.php
new file mode 100644
index 00000000..e7837e8b
--- /dev/null
+++ b/plugins/torque-contact-form/src/form/form-contact-field.php
@@ -0,0 +1,124 @@
+<?php
+
+class Torque_Contact_Form_Field_Factory {
+
+  public static $supported_field_types = array(
+    'text',
+    'textarea',
+    'email',
+    'tel',
+    'radio'
+  );
+
+  public static function create_new( $id, $options ) {
+    $type = $options['type'] ?? false;
+
+    if ( ! $type ) {
+      return;
+    }
+
+    switch( $type ) {
+
+      case 'text':
+        return self::create_text_field($id, $options);
+
+      case 'textarea':
+        return self::create_textarea_field($id, $options);
+
+      case 'email':
+        return self::create_email_field($id, $options);
+
+      case 'tel':
+        return self::create_tel_field($id, $options);
+
+      case 'radio':
+        return self::create_radio_field($id, $options);
+    }
+  }
+
+  private static function create_text_field($id, $options) {
+    ob_start();
+    ?>
+    <input type="text" name="<?php echo $id; ?>" id="<?php echo $id; ?>" placeholder="<?php echo $options['name']; ?>"/>
+    <?php
+
+    $content = ob_get_clean();
+
+    return self::wrap_field($id, $options, $content);
+  }
+
+  private static function create_textarea_field($id, $options) {
+    ob_start();
+    ?>
+    <textarea name="<?php echo $id; ?>" id="<?php echo $id; ?>" placeholder="<?php echo $options['name']; ?>"></textarea>
+    <?php
+
+    $content = ob_get_clean();
+
+    return self::wrap_field($id, $options, $content);
+  }
+
+  private static function create_email_field($id, $options) {
+    ob_start();
+    ?>
+    <input type="email" name="<?php echo $id; ?>" id="<?php echo $id; ?>" placeholder="<?php echo $options['name']; ?>"/>
+    <?php
+
+    $content = ob_get_clean();
+
+    return self::wrap_field($id, $options, $content);
+  }
+
+  private static function create_tel_field($id, $options) {
+    ob_start();
+    ?>
+    <input type="tel" name="<?php echo $id; ?>" id="<?php echo $id; ?>" placeholder="<?php echo $options['name']; ?>"/>
+    <?php
+
+    $content = ob_get_clean();
+
+    return self::wrap_field($id, $options, $content);
+  }
+
+  private static function create_radio_field($id, $options) {
+    ob_start();
+    ?>
+    <fieldset id="<?php echo $id; ?>">
+    <?php
+      if ($options['options']) {
+        foreach ($options['options'] as $value => $label) {
+          ?>
+          <div class="radio-wrapper">
+            <input type="radio" id="<?php echo $value; ?>" name="<?php echo $id; ?>" value="<?php echo $value; ?>" <?php checked( $value, $_POST[$id] ?? '' ); ?>>
+            <label for="<?php echo $value; ?>"><?php echo $label; ?></label>
+          </div>
+          <?php
+        }
+      }
+    ?>
+    </fieldset>
+    <?php
+
+    $content = ob_get_clean();
+
+    return self::wrap_field($id, $options, $content);
+  }
+
+  private static function wrap_field($id, $options, $content) {
+    ob_start();
+
+    $name = $options['name'] ?? '';
+
+    ?>
+
+    <div id="<?php echo $id; ?>" class="input-wrapper">
+      <label for="<?php echo $id; ?>"><?php echo $name; ?></label>
+      <?php echo $content; ?>
+    </div>
+
+    <?php
+    return ob_get_clean();
+  }
+}
+
+?>
diff --git a/plugins/torque-contact-form/src/form/form-contact-template.php b/plugins/torque-contact-form/src/form/form-contact-template.php
new file mode 100644
index 00000000..6d36a694
--- /dev/null
+++ b/plugins/torque-contact-form/src/form/form-contact-template.php
@@ -0,0 +1,95 @@
+<?php
+
+require_once( Torque_Contact_Form_PATH . '/form/form-contact.php' );
+require_once( Torque_Contact_Form_PATH . '/form/form-contact-field.php' );
+
+class Torque_Contact_Form_Form_Template {
+
+  private $fields = array();
+
+  private $message;
+
+  public function __construct( $fields, $message = NULL) {
+    $this->fields = $fields;
+
+    if ( $message ) {
+      $this->message = $message;
+    }
+  }
+
+  public function create_markup() {
+    ob_start();
+    ?>
+
+    <div id="contact-form" class="torque-form">
+
+      <?php $this->the_message(); ?>
+
+      <form method="post" action="#contact-form" >
+
+        <?php $this->the_nonce(); ?>
+
+        <?php
+        // this hidden input is important for us to know
+        // if the form has been submitted yet
+        // so we can check that all fields are filled
+        ?>
+        <input type="hidden" name="<?php echo Torque_Contact_Form_Form::$HIDDEN_FIELD_NAME; ?>" />
+
+        <?php $this->the_fields(); ?>
+
+        <button type="submit">Send</button>
+
+      </form>
+
+    </div>
+
+    <?php
+    return ob_get_clean();
+  }
+
+  private function the_message() {
+    echo $this->get_the_message();
+  }
+
+  private function get_the_message() {
+    ob_start();
+
+    if (isset($this->message) && $this->message) {
+
+      $success_class = ! $this->message['success'] ? 'error' : '';
+
+      ?>
+
+      <div class="form-message <?php echo $success_class; ?>">
+        <?php echo $this->message['message']; ?>
+      </div>
+
+      <?php
+    }
+
+    return ob_get_clean();
+  }
+
+  private function the_nonce() {
+    echo $this->get_the_nonce();
+  }
+
+  private function get_the_nonce() {
+    return wp_nonce_field( Torque_Contact_Form_Form::$NONCE_NAME );
+  }
+
+  private function the_fields() {
+
+    foreach ($this->fields as $id => $options) {
+
+      if ( $options['type'] && in_array( $options['type'], Torque_Contact_Form_Field_Factory::$supported_field_types ) ) {
+
+        echo Torque_Contact_Form_Field_Factory::create_new($id, $options);
+
+      }
+    }
+  }
+}
+
+?>
diff --git a/plugins/torque-contact-form/src/form/form-contact.php b/plugins/torque-contact-form/src/form/form-contact.php
new file mode 100644
index 00000000..32adbf94
--- /dev/null
+++ b/plugins/torque-contact-form/src/form/form-contact.php
@@ -0,0 +1,112 @@
+<?php
+
+require_once( Torque_Contact_Form_PATH . '/form/form-contact-template.php' );
+require_once( Torque_Contact_Form_PATH . '/form/form-contact-field.php' );
+require_once( Torque_Contact_Form_PATH . '/form/form-contact-email.php' );
+
+class Torque_Contact_Form_Form {
+
+  public static $FIELDS_FILTER_HANDLE = 'torque_contact_form_fields_filter';
+
+  public static $NONCE_NAME = 'torque_contact_form_nonce';
+
+  public static $HIDDEN_FIELD_NAME = 'torque_contact_form_hidden_field';
+
+  private $fields = array();
+
+  private $recipient;
+
+  public function __construct( $recipient ) {
+    $this->recipient = $recipient;
+
+    // allow child theme to hide (or add) fields
+    $this->fields = apply_filters( self::$FIELDS_FILTER_HANDLE, array(
+      'tq-name'               => array(
+        'name'  => 'Name',
+        'type'  => 'text'
+      ),
+      'tq-email'              => array(
+        'name'  => 'Email',
+        'type'  => 'email'
+      ),
+      'tq-state'              => array(
+        'name'  => 'State',
+        'type'  => 'text'
+      ),
+      'tq-zip'                => array(
+        'name'  => 'Zip Code',
+        'type'  => 'text'
+      ),
+      'tq-phone'              => array(
+        'name'  => 'Phone',
+        'type'  => 'tel'
+      ),
+      /*
+       Example radio buttons option
+
+      'tq-resident-investor'  => array(
+        'name'    => 'I am a:',
+        'type'    => 'radio',
+        'options' => array(
+          'resident'  => 'Resident',
+          'investor'  => 'Investor'
+        )
+      ),
+      */
+      'tq-message'            => array(
+        'name'  => 'Message',
+        'type'  => 'textarea'
+      ),
+    ));
+  }
+
+  public function get_form_markup() {
+    $message = $this->maybe_handle_submit();
+
+    $template = new Torque_Contact_Form_Form_Template( $this->fields, $message );
+    return $template->create_markup();
+  }
+
+  public function maybe_handle_submit() {
+    $message = null;
+
+    if (isset($_POST[self::$HIDDEN_FIELD_NAME])) {
+      // form was submitted
+      try {
+        foreach ($this->fields as $field_id => $field_options) {
+          if ( ! isset( $_POST[$field_id] ) ) {
+            throw new Exception('All form fields are required');
+          }
+        }
+
+        if (
+          ! isset($_POST['_wpnonce']) ||
+          ! wp_verify_nonce( $_POST['_wpnonce'], self::$NONCE_NAME )
+        ) {
+          // couldnt verify nonce
+          throw new Exception('Form failed validation');
+        }
+
+        // form is validated - send email
+        $email = new Torque_Contact_Form_Email($this->recipient, $this->fields);
+        $email->send();
+
+        $message = array(
+          'success' => true,
+          'message' => 'Message sent successfully!'
+        );
+
+      } catch (Exception $e) {
+
+        $message = array(
+          'success' => false,
+          'message' => $e->getMessage() !== '' ? $e->getMessage() : 'Something went wrong'
+        );
+      }
+    }
+
+    return $message;
+  }
+}
+
+?>
diff --git a/plugins/torque-contact-form/src/index.js b/plugins/torque-contact-form/src/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/torque-contact-form/src/shortcode/torque-contact-form-shortcode-class.php b/plugins/torque-contact-form/src/shortcode/torque-contact-form-shortcode-class.php
new file mode 100644
index 00000000..f1b51e2f
--- /dev/null
+++ b/plugins/torque-contact-form/src/shortcode/torque-contact-form-shortcode-class.php
@@ -0,0 +1,79 @@
+<?php
+
+require( Torque_Contact_Form_PATH . 'shortcode/torque-contact-form-tinymce-class.php' );
+require( Torque_Contact_Form_PATH . 'form/form-contact.php' );
+
+class Torque_Contact_Form_Shortcode {
+
+  public static $SHORTCODE_SLUG = 'torque_contact_form';
+
+  protected $expected_args = array();
+
+  private $atts = array();
+
+	private $content = '';
+
+  /**
+   * Add the shortcode and link it to our callback
+   */
+  public function __construct() {
+    // use this array to attributes and display them in the front end
+    // for private attributes go to setup_atts()
+    $this->expected_args = array(
+      'recipient_email' => '',
+    );
+
+		add_shortcode( self::$SHORTCODE_SLUG , array( $this, 'shortcode_handler') );
+
+    add_action( 'load-post.php'    ,  array(
+      Torque_Contact_Form_TinyMCE::get_inst(),
+      'init' ),
+    20 );
+    add_action( 'load-post-new.php',  array(
+      Torque_Contact_Form_TinyMCE::get_inst(),
+      'init' ),
+    20 );
+	}
+
+  /**
+   * The callback for the shortcode, should output some markup to be displayed.
+   *
+   * @param  array $atts    Attributes found when parsing shortcode
+   * @param  string $content Children found inside enclosing shortcode tags
+   * @return string
+   */
+  public function shortcode_handler( $atts, $content ) {
+    $this->atts = $this->setup_atts( $atts );
+    $this->content = $content;
+
+    return $this->get_markup();
+  }
+
+  /**
+   * Combing the atts found when parsing the shortcode with our default atts
+   *
+   * @param  array $atts    Attributes found when parsing shortcode
+   * @return array       Attributes combined with our defaults
+   */
+  private function setup_atts($atts) {
+    return shortcode_atts( array_merge( $this->expected_args,
+      // these are your arguments that do not show up in the front end.
+      array(
+        '' => ''
+      ) ), $atts, self::$SHORTCODE_SLUG );
+  }
+
+
+  /**
+   * Using the atts and content saved to the instance,
+   * we should return some markup here that the shortcoded will be returned as.
+   *
+   * @return string
+   */
+  private function get_markup() {
+    $form = new Torque_Contact_Form_Form( $this->atts['recipient_email'] );
+    return $form->get_form_markup();
+  }
+}
+
+?>
diff --git a/plugins/torque-contact-form/src/shortcode/torque-contact-form-tinymce-class.php b/plugins/torque-contact-form/src/shortcode/torque-contact-form-tinymce-class.php
new file mode 100644
index 00000000..ab37e29d
--- /dev/null
+++ b/plugins/torque-contact-form/src/shortcode/torque-contact-form-tinymce-class.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Handle registratioin of tinymce plugin for shortcode
+ */
+class Torque_Contact_Form_TinyMCE {
+
+	public static $instance = NULL;
+
+	/**
+	 * Filter whether to display the tinymce plugin button or not.
+	 *
+	 * @var string
+	 */
+	public static $TINYMCE_PLUGIN_BUTTON_FILTER = 'torque_contact_form_tinymce_plugin_button';
+
+	function __construct() {}
+
+	public static function get_inst() {
+		!self::$instance AND self::$instance = new self;
+
+		return self::$instance;
+	}
+
+	public function init() {
+		add_filter( "mce_external_plugins" , array( $this, 'mce_plugin' ) );
+    add_action( 'admin_footer'         , array( $this, 'insert_editor' ) );
+    add_action( 'print_media_templates', array( $this, 'media_templates' ) );
+
+		if ( apply_filters( self::$TINYMCE_PLUGIN_BUTTON_FILTER, true ) )
+    	add_filter( "mce_buttons"          , array( $this, 'mce_button' ) );
+	}
+
+	public function mce_plugin( $plugin_array ) {
+		$plugin_array['torque_contact_form'] = '/wp-content/plugins/torque-contact-form/shortcode/torque-contact-form-tinymce-plugin.js';
+		return $plugin_array;
+	}
+
+	public function mce_button( $buttons ) {
+    array_push( $buttons, 'torque_contact_form_button' );
+		return $buttons;
+	}
+
+	public function insert_editor( $hook ) {
+		?>
+		<div id="torque-contact-form-builder" style="display:none;">
+		</div>
+		<?php
+	}
+
+	public function media_templates() {
+		if ( ! isset( get_current_screen()->id )
+			|| get_current_screen()->base != 'post' )
+      return;
+		include_once 'torque-contact-form-tinymce-editor.html';
+	}
+}
+
+?>
diff --git a/plugins/torque-contact-form/src/shortcode/torque-contact-form-tinymce-editor.html b/plugins/torque-contact-form/src/shortcode/torque-contact-form-tinymce-editor.html
new file mode 100644
index 00000000..4fc30dec
--- /dev/null
+++ b/plugins/torque-contact-form/src/shortcode/torque-contact-form-tinymce-editor.html
@@ -0,0 +1,8 @@
+<script type="text/html" id="tmpl-editor-torque-contact-form-template">
+	<div style="display: block; border: 1px dashed #ccc;">
+		<div style="display: block; box-sizing: border-box; padding: 10px;">
+			<span>Torque Contact Form</span>
+		</div>
+		<div style="clear:both;"></div>
+	</div>
+</script>
diff --git a/plugins/torque-contact-form/src/shortcode/torque-contact-form-tinymce-plugin.js b/plugins/torque-contact-form/src/shortcode/torque-contact-form-tinymce-plugin.js
new file mode 100644
index 00000000..e012a425
--- /dev/null
+++ b/plugins/torque-contact-form/src/shortcode/torque-contact-form-tinymce-plugin.js
@@ -0,0 +1,87 @@
+(function($) {
+  $(document).ready(function() {
+    // holds our row shortcode name
+    var shortcode_string = "torque_contact_form";
+
+    wp.media = wp.media || {};
+    wp.mce = wp.mce || {};
+
+    // our torque_contact_form template
+    wp.mce.torque_contact_form = {
+      // holds data from our shortcode
+      shortcode_data: {},
+
+      // set our template
+      // @see editor-torque-contact-form-template.html
+      template: wp.media.template("editor-torque-contact-form-template"),
+
+      // gets called everytime the shortcode is
+      // loaded in the Visual tab of the WYSISWYG
+      getContent: function() {
+        // build options
+        var options = { ...this.shortcode.attrs.named };
+        // insert template into editor
+        return this.template(options);
+      },
+
+      // get called when clicking on the edit
+      // button on the shortcode's UI in the
+      // Visual tab of the WYSIWYG editor
+      edit: function(data) {
+        // build options
+        var shortcode_data = wp.shortcode.next(shortcode_string, data);
+        var values = shortcode_data.shortcode.attrs.named;
+        wp.mce.torque_contact_form.popupwindow(tinyMCE.activeEditor, values);
+      },
+
+      popupwindow: function(editor, values, onsubmit_callback) {
+        values = values || [];
+        if (typeof onsubmit_callback !== "function") {
+          onsubmit_callback = function(e) {
+            // Insert content when the window form is submitted (this also replaces during edit, handy!)
+            var _attr = {};
+
+            if (e.data.recipient_email) {
+              _attr.recipient_email = e.data.recipient_email;
+            }
+
+            var args = {
+              tag: shortcode_string,
+              type: "closed",
+              content: "",
+              attrs: _attr
+            };
+            editor.insertContent(wp.shortcode.string(args));
+          };
+        }
+        var formBody = [
+          {
+            type: "textbox",
+            name: "recipient_email",
+            label: "Recipient Email",
+            value: values.recipient_email
+          }
+        ];
+
+        editor.windowManager.open({
+          title: "Torque Contact Form",
+          body: formBody,
+          onsubmit: onsubmit_callback
+        });
+      }
+    }; // torque_contact_form
+
+    // register the tinymce view template
+    wp.mce.views.register(shortcode_string, wp.mce.torque_contact_form);
+  });
+
+  tinymce.PluginManager.add("torque_contact_form", function(editor) {
+    editor.addButton("torque_contact_form_button", {
+      text: "Torque Contact Form",
+      icon: false,
+      onclick: function() {
+        wp.mce.torque_contact_form.popupwindow(editor);
+      }
+    });
+  });
+})(jQuery);
diff --git a/plugins/torque-contact-form/src/torque-contact-form.php b/plugins/torque-contact-form/src/torque-contact-form.php
new file mode 100644
index 00000000..ff4a0cf0
--- /dev/null
+++ b/plugins/torque-contact-form/src/torque-contact-form.php
@@ -0,0 +1,85 @@
+<?php
+// entry point for backend of plugin
+
+ /**
+  * Plugin Name: Torque Contact Form
+  * Description:
+  * Version:     1.0.0
+  * Author:      Torque
+  * Author URI:  https://torque.digital
+  * License:     GPL
+  *
+  * @package Torque Contact Form
+  */
+
+// If this file is called directly, abort.
+if ( ! defined( 'WPINC' ) ) {
+	die;
+}
+
+/**
+ * Define constants for plugin's url and path
+ */
+define( 'Torque_Contact_Form_PATH', plugin_dir_path(__FILE__) );
+define( 'Torque_Contact_Form_URL', plugin_dir_url(__FILE__) );
+
+/**
+ * Require autoloader for plugin classes
+ */
+require( Torque_Contact_Form_PATH . '/autoload.php' );
+
+/**
+ * Register plugin
+ */
+add_action( 'plugins_loaded', array( Torque_Contact_Form::get_inst(), 'init' ) );
+
+class Torque_Contact_Form {
+
+	public static $instance = NULL;
+
+	public static $PLUGIN_NAME = 'Torque Contact Form';
+
+	public static $PLUGIN_SLUG = 'torque-contact-form';
+
+	public static function get_inst() {
+		!self::$instance AND self::$instance = new self;
+
+		return self::$instance;
+	}
+
+	/**
+	 * left empty on purpose
+	 */
+	public function __construct() {}
+
+	/**
+   * This should be a function which registers all the plugin's required hooks.
+   */
+	public function init() {
+
+		// comment out class names to exclude
+		Torque_Contact_Form_Autoloader::autoload( array(
+			'Torque_Contact_Form_Shortcode',
+		) );
+
+		// enqueue plugin scripts
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_plugin_scripts' ) );
+	}
+
+	public function enqueue_plugin_scripts() {
+		wp_enqueue_script(
+			'torque-contact-form-scripts',
+			Torque_Contact_Form_URL . 'bundles/bundle.js',
+			array() ,
+			'0.0.1',
+			true
+		);
+
+		wp_enqueue_style(
+			'torque-contact-form-styles',
+			Torque_Contact_Form_URL . 'bundles/main.css'
+		);
+	}
+}
+
+?>
diff --git a/plugins/torque-contact-form/webpack.config.js b/plugins/torque-contact-form/webpack.config.js
new file mode 100644
index 00000000..d22721c1
--- /dev/null
+++ b/plugins/torque-contact-form/webpack.config.js
@@ -0,0 +1,82 @@
+const projectConfig = require('../../config')
+const path = require('path')
+const webpack = require('webpack')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+
+const srcDir = path.join(__dirname, 'src')
+const buildDir = path.join(
+  projectConfig.root,
+  'wp-content/plugins/torque-contact-form'
+)
+
+const config = {
+  context: srcDir,
+
+  entry: {
+    main: ['./index.js'],
+  },
+
+  output: {
+    path: path.join(buildDir, './bundles'),
+    publicPath: '/',
+    filename: 'bundle.js',
+  },
+
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+        },
+      },
+      {
+        test: projectConfig.webpackDefaults.css.test,
+        exclude: /node_modules/,
+        use: ExtractTextPlugin.extract({
+          fallback: 'style-loader?sourceMap',
+          use: projectConfig.webpackDefaults.css.loaders,
+        }),
+      },
+      {
+        test: projectConfig.webpackDefaults.scssModules.test,
+        exclude: /node_modules/,
+        use: ExtractTextPlugin.extract({
+          fallback: 'style-loader?sourceMap',
+          // resolve-url-loader may be chained before sass-loader if necessary
+          use: projectConfig.webpackDefaults.scssModules.loaders,
+        }),
+      },
+      {
+        test: projectConfig.webpackDefaults.images.test,
+        exclude: /node_modules/,
+        use: projectConfig.webpackDefaults.images.loaders,
+      },
+      {
+        test: projectConfig.webpackDefaults.fonts.test,
+        exclude: /node_modules/,
+        use: projectConfig.webpackDefaults.fonts.loaders,
+      },
+    ],
+  },
+
+  plugins: [
+    new ExtractTextPlugin({
+      filename: 'main.css',
+      publicPath: '/',
+      allChunks: true,
+      ignoreOrder: true,
+    }),
+    new CopyWebpackPlugin([
+      { from: path.join(srcDir, 'shortcode/*.js'), to: buildDir },
+      { from: path.join(srcDir, 'shortcode/*.html'), to: buildDir },
+      { from: path.join(srcDir, '**/*.php'), to: buildDir },
+    ]),
+  ],
+
+  devtool: 'source-map',
+}
+
+module.exports = config
diff --git a/themes/torque/src/includes/utilities/torque-utilities.php b/themes/torque/src/includes/utilities/torque-utilities.php
index 799575a5..216fb1c7 100755
--- a/themes/torque/src/includes/utilities/torque-utilities.php
+++ b/themes/torque/src/includes/utilities/torque-utilities.php
@@ -90,4 +90,18 @@ public static function get_category_id( $cat_name ){
   		$term = get_term_by( 'name', $cat_name, 'category' );
   		return $term->term_id;
   	}
+
+    public static function array_swap_assoc($key1, $key2, $array) {
+      $newArray = array ();
+      foreach ($array as $key => $value) {
+        if ($key == $key1) {
+          $newArray[$key2] = $array[$key2];
+        } elseif ($key == $key2) {
+          $newArray[$key1] = $array[$key1];
+        } else {
+          $newArray[$key] = $value;
+        }
+      }
+      return $newArray;
+    }
   }