diff --git a/lib/ey-core/cli/environment_variables.rb b/lib/ey-core/cli/environment_variables.rb
index 940f83a..3df8a75 100644
--- a/lib/ey-core/cli/environment_variables.rb
+++ b/lib/ey-core/cli/environment_variables.rb
@@ -1,70 +1,9 @@
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/helpers/stream_printer'
+require_relative "environment_variables/main"
 
 module Ey
   module Core
     module Cli
-      class EnvironmentVariables < Subcommand
-        MASK = '****'.freeze
-        SYMBOLS_TO_DISPLAY = 4
-        MAX_LENGTH_TO_DISPLAY = 30
-
-        include Ey::Core::Cli::Helpers::StreamPrinter
-
-        title "environment_variables"
-        summary "Retrieve a list of Engine Yard environment variables for environments that you have access to."
-
-        option :environment,
-          short: 'e',
-          long: 'environment',
-          description: 'Filter by environmeent name or id',
-          argument: 'Environment'
-
-        option :application,
-          short: 'a',
-          long: 'application',
-          description: 'Filter by application name or id',
-          argument: 'Application'
-
-        switch :display_sensitive,
-          short: 's',
-          long: 'display_sensitive',
-          description: 'Determines whether values of sensitive variables should be printed',
-          argument: 'Display Sensitive'
-
-        def handle
-          environment_variables = if option(:application)
-                                    core_applications(option(:application)).flat_map(&:environment_variables)
-                                  elsif option(:environment)
-                                    core_environments(option(:environment)).flat_map(&:environment_variables)
-                                  else
-                                    core_environment_variables
-                                  end
-
-          stream_print("ID" => 10, "Name" => 30, "Value" => 50, "Environment" => 30, "Application" => 30) do |printer|
-            environment_variables.each_entry do |ev|
-              printer.print(ev.id, ev.name, print_variable_value(ev), ev.environment_name, ev.application_name)
-            end
-          end
-        end
-
-        private
-
-        def print_variable_value(environment_variable)
-          if environment_variable.sensitive && !switch_active?(:display_sensitive)
-            hide_sensitive_data(environment_variable.value)
-          else
-            environment_variable.value
-          end
-        end
-
-        def hide_sensitive_data(value)
-          if value.length > SYMBOLS_TO_DISPLAY
-            MASK + value[-SYMBOLS_TO_DISPLAY, SYMBOLS_TO_DISPLAY]
-          else
-            MASK
-          end
-        end
+      module EnvironmentVariables
       end
     end
   end
diff --git a/lib/ey-core/cli/environment_variables/create.rb b/lib/ey-core/cli/environment_variables/create.rb
new file mode 100644
index 0000000..0403b53
--- /dev/null
+++ b/lib/ey-core/cli/environment_variables/create.rb
@@ -0,0 +1,81 @@
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      module EnvironmentVariables
+        class Create < Ey::Core::Cli::Subcommand
+            MASK = '****'.freeze
+            SYMBOLS_TO_DISPLAY = 4
+            MAX_LENGTH_TO_DISPLAY = 30
+
+            include Ey::Core::Cli::Helpers::StreamPrinter
+
+            title "create"
+            summary "Create Engine Yard environment variable "
+
+            option :environment,
+            short: 'e',
+            long: 'environment',
+            description: 'Filter by environmeent name or id',
+            argument: 'Environment'
+
+            option :application,
+            short: 'a',
+            long: 'application',
+            description: 'Filter by application name or id',
+            argument: 'Application'
+
+            option :display_sensitive,
+            short: 's',
+            long: 'display_sensitive',
+            description: 'Determines whether values of sensitive variables should be printed',
+            argument: 'Display Sensitive'
+            
+            
+            option :key,
+            short: 'k',
+            long: 'key',
+            description: 'Key',
+            argument: 'Key'
+
+            option :value,
+            short: 'v',
+            long: 'value',
+            description: 'Value',
+            argument: 'Value'
+
+            def handle
+              application_name = option(:application)
+              environment_name = option(:environment)
+              key = option(:key)
+              value = option(:value)
+
+              puts "Create Environment Variable"
+              env = core_client.environments.filter{ |env| env.name == environment_name }&.first
+              app = core_client.applications.filter{ |app| app.name == application_name }&.first
+              puts core_client.environment_variables.create(name:key,value:value,environment_id:env.id, application_id: app.id)
+            end
+
+            private
+
+            def print_variable_value(environment_variable)
+              if environment_variable.sensitive && !switch_active?(:display_sensitive)
+                  hide_sensitive_data(environment_variable.value)
+              else
+                  environment_variable.value
+              end
+            end
+
+            def hide_sensitive_data(value)
+            if value.length > SYMBOLS_TO_DISPLAY
+                MASK + value[-SYMBOLS_TO_DISPLAY, SYMBOLS_TO_DISPLAY]
+            else
+                MASK
+            end
+            end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/ey-core/cli/environment_variables/destroy.rb b/lib/ey-core/cli/environment_variables/destroy.rb
new file mode 100644
index 0000000..9891f26
--- /dev/null
+++ b/lib/ey-core/cli/environment_variables/destroy.rb
@@ -0,0 +1,80 @@
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      module EnvironmentVariables
+        class Destroy < Ey::Core::Cli::Subcommand
+            MASK = '****'.freeze
+            SYMBOLS_TO_DISPLAY = 4
+            MAX_LENGTH_TO_DISPLAY = 30
+
+            include Ey::Core::Cli::Helpers::StreamPrinter
+
+            title "destroy"
+            summary "Destory a Engine Yard environment variable "
+
+            option :environment,
+            short: 'e',
+            long: 'environment',
+            description: 'Filter by environmeent name or id',
+            argument: 'Environment'
+
+            option :application,
+            short: 'a',
+            long: 'application',
+            description: 'Filter by application name or id',
+            argument: 'Application'
+
+            option :display_sensitive,
+            short: 's',
+            long: 'display_sensitive',
+            description: 'Determines whether values of sensitive variables should be printed',
+            argument: 'Display Sensitive'
+            
+            option :key,
+            short: 'k',
+            long: 'key',
+            description: 'Key',
+            argument: 'Key'
+
+            option :value,
+            short: 'v',
+            long: 'value',
+            description: 'Value',
+            argument: 'Value'
+
+            def handle
+              application_name = option(:application)
+              environment_name = option(:environment)
+              key = option(:key)
+              value = option(:value)
+
+              puts "Destroy Environment Variable"
+              environment = core_client.environments.first{|e| e.name == environment_name && e.application.name == application_name }
+              ev =  core_client.environment_variables.first{|ev| ev.name == key && ev.environment_id == environment.id && ev.application_id == environment.application.id }
+              puts ev.destroy!  
+            end
+
+            private
+
+            def print_variable_value(environment_variable)
+              if environment_variable.sensitive && !switch_active?(:display_sensitive)
+                  hide_sensitive_data(environment_variable.value)
+              else
+                  environment_variable.value
+              end
+            end
+
+            def hide_sensitive_data(value)
+              if value.length > SYMBOLS_TO_DISPLAY
+                  MASK + value[-SYMBOLS_TO_DISPLAY, SYMBOLS_TO_DISPLAY]
+              else
+                  MASK
+              end
+            end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/ey-core/cli/environment_variables/list.rb b/lib/ey-core/cli/environment_variables/list.rb
new file mode 100644
index 0000000..5db65b6
--- /dev/null
+++ b/lib/ey-core/cli/environment_variables/list.rb
@@ -0,0 +1,72 @@
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      module EnvironmentVariables
+        class List < Ey::Core::Cli::Subcommand
+            MASK = '****'.freeze
+            SYMBOLS_TO_DISPLAY = 4
+            MAX_LENGTH_TO_DISPLAY = 30
+
+            include Ey::Core::Cli::Helpers::StreamPrinter
+
+            title "list"
+            summary "Retrieve a list of Engine Yard environment variables for environments that you have access to."
+
+            option :environment,
+            short: 'e',
+            long: 'environment',
+            description: 'Filter by environmeent name or id',
+            argument: 'Environment'
+
+            option :application,
+            short: 'a',
+            long: 'application',
+            description: 'Filter by application name or id',
+            argument: 'Application'
+
+            switch :display_sensitive,
+            short: 's',
+            long: 'display_sensitive',
+            description: 'Determines whether values of sensitive variables should be printed',
+            argument: 'Display Sensitive'
+            
+            def handle
+            environment_variables = if option(:application)
+                                        core_applications(option(:application)).flat_map(&:environment_variables)
+                                    elsif option(:environment)
+                                        core_environments(option(:environment)).flat_map(&:environment_variables)
+                                    else
+                                        core_environment_variables
+                                    end
+              stream_print("ID" => 10, "Name" => 30, "Value" => 50, "Environment" => 30, "Application" => 30) do |printer|
+                environment_variables.each_entry do |ev|
+                  printer.print(ev.id, ev.name, ev.value, ev.environment_name, ev.application_name)
+                end
+              end
+            end
+
+            private
+
+            def print_variable_value(environment_variable)
+              puts "in print_variable_value"
+              if environment_variable.sensitive && !switch_active?(:display_sensitive)
+                  hide_sensitive_data(environment_variable.value)
+              else
+                  environment_variable.value
+              end
+            end
+
+            def hide_sensitive_data(value)
+            if value.length > SYMBOLS_TO_DISPLAY
+                MASK + value[-SYMBOLS_TO_DISPLAY, SYMBOLS_TO_DISPLAY]
+            else
+                MASK
+            end
+            end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/ey-core/cli/environment_variables/main.rb b/lib/ey-core/cli/environment_variables/main.rb
new file mode 100644
index 0000000..be40473
--- /dev/null
+++ b/lib/ey-core/cli/environment_variables/main.rb
@@ -0,0 +1,23 @@
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/environment_variables/list'
+require 'ey-core/cli/environment_variables/create'
+require 'ey-core/cli/environment_variables/update'
+require 'ey-core/cli/environment_variables/destroy'
+
+module Ey
+  module Core
+    module Cli
+      module EnvironmentVariables
+        class Main < Ey::Core::Cli::Subcommand
+          title "environment_variables"
+          summary "Environment variables specific commands"
+
+          mount Ey::Core::Cli::EnvironmentVariables::List
+          mount Ey::Core::Cli::EnvironmentVariables::Create
+          mount Ey::Core::Cli::EnvironmentVariables::Update
+          mount Ey::Core::Cli::EnvironmentVariables::Destroy
+        end
+      end
+    end
+  end
+end
diff --git a/lib/ey-core/cli/environment_variables/update.rb b/lib/ey-core/cli/environment_variables/update.rb
new file mode 100644
index 0000000..d4fc20f
--- /dev/null
+++ b/lib/ey-core/cli/environment_variables/update.rb
@@ -0,0 +1,80 @@
+require 'ey-core/cli/subcommand'
+
+module Ey
+  module Core
+    module Cli
+      module EnvironmentVariables
+        class Update < Ey::Core::Cli::Subcommand
+            MASK = '****'.freeze
+            SYMBOLS_TO_DISPLAY = 4
+            MAX_LENGTH_TO_DISPLAY = 30
+
+            include Ey::Core::Cli::Helpers::StreamPrinter
+
+            title "update"
+            summary "Update Engine Yard environment variable "
+
+            option :environment,
+            short: 'e',
+            long: 'environment',
+            description: 'Filter by environmeent name or id',
+            argument: 'Environment'
+
+            option :application,
+            short: 'a',
+            long: 'application',
+            description: 'Filter by application name or id',
+            argument: 'Application'
+
+            option :display_sensitive,
+            short: 's',
+            long: 'display_sensitive',
+            description: 'Determines whether values of sensitive variables should be printed',
+            argument: 'Display Sensitive'
+            
+            option :key,
+            short: 'k',
+            long: 'key',
+            description: 'Key',
+            argument: 'Key'
+
+            option :value,
+            short: 'v',
+            long: 'value',
+            description: 'Value',
+            argument: 'Value'
+
+            def handle
+              application_name = option(:application)
+              environment_name = option(:environment)
+              key = option(:key)
+              value = option(:value)
+
+              puts "Update Environment Variable"
+              environment = core_client.environments.first{|e| e.name == environment_name && e.application.name == application_name }
+              ev =  core_client.environment_variables.first{|ev| ev.name == key && ev.environment_id == environment.id && ev.application_id == environment.application.id }
+              puts ev.update(name:key,value:value)
+            end
+
+            private
+
+            def print_variable_value(environment_variable)
+              if environment_variable.sensitive && !switch_active?(:display_sensitive)
+                  hide_sensitive_data(environment_variable.value)
+              else
+                  environment_variable.value
+              end
+            end
+
+            def hide_sensitive_data(value)
+            if value.length > SYMBOLS_TO_DISPLAY
+                MASK + value[-SYMBOLS_TO_DISPLAY, SYMBOLS_TO_DISPLAY]
+            else
+                MASK
+            end
+            end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/ey-core/cli/main.rb b/lib/ey-core/cli/main.rb
index 787c17e..3f4999c 100644
--- a/lib/ey-core/cli/main.rb
+++ b/lib/ey-core/cli/main.rb
@@ -45,7 +45,7 @@ class Main < Belafonte::App
         mount Deploy
         mount DockerRegistryLogin
         mount Environments
-        mount EnvironmentVariables
+        mount EnvironmentVariables::Main
         mount Help
         mount Init
         mount Login
diff --git a/lib/ey-core/client.rb b/lib/ey-core/client.rb
index 9f95f26..5600bf4 100644
--- a/lib/ey-core/client.rb
+++ b/lib/ey-core/client.rb
@@ -186,6 +186,7 @@ class Ey::Core::Client < Cistern::Service
   request :destroy_database_server_snapshot
   request :destroy_database_service
   request :destroy_environment
+  request :destroy_environment_variable
   request :destroy_firewall
   request :destroy_firewall_rule
   request :destroy_load_balancer
diff --git a/lib/ey-core/models/environment_variable.rb b/lib/ey-core/models/environment_variable.rb
index d42b0ba..1dbff20 100644
--- a/lib/ey-core/models/environment_variable.rb
+++ b/lib/ey-core/models/environment_variable.rb
@@ -26,4 +26,8 @@ def save!
       merge_attributes(self.connection.update_environment_variable(params).body["environment_variable"])
     end
   end
+
+  def destroy!
+    connection.requests.new(self.connection.destroy_environment_variable("id" => self.id).request)
+  end
 end
diff --git a/lib/ey-core/requests/destroy_environment_variable.rb b/lib/ey-core/requests/destroy_environment_variable.rb
new file mode 100644
index 0000000..241e1e8
--- /dev/null
+++ b/lib/ey-core/requests/destroy_environment_variable.rb
@@ -0,0 +1,48 @@
+class Ey::Core::Client
+  class Real
+    def destroy_environment_variable(params={})
+      id  = params["id"]
+
+      response = request(
+        :path   => "/environment_variables/#{id}",
+        :method => :delete,
+      )
+      response
+    end
+  end
+
+  class Mock
+    def destroy_environment_variable(params={})
+      extract_url_params!(params)
+      request_id = self.uuid
+
+      environment_variable_id = params["id"] || params["environment_variable"]
+
+      environment_variable = self.find(:environment_variables, environment_variable_id)
+
+      request = {
+        "finished_at" => nil,
+        "id"          => request_id,
+        "started_at"  => Time.now,
+        "successful"  => "true",
+        "type"        => "deprovision_environment_variable",
+        "resource"    => [:environment_variables, environment_variable_id, lambda do |r|
+          environment_variable.merge!("deleted_at" => Time.now)
+
+          self.data[:database_servers].values.
+            select { |ds| ds["environment_variable"] == url_for("/environment_variables/#{environment_variable["id"]}") }.
+            each { |ds| ds["deleted_at"] = Time.now }
+
+          r.delete("resource_url")
+        end],
+      }
+
+      self.data[:requests][request_id] = request
+
+      response(
+        :body   => {"request" => {id: request_id}},
+        :status => 201,
+      )
+    end
+  end
+end
diff --git a/lib/ey-core/version.rb b/lib/ey-core/version.rb
index 1437251..842a3ab 100644
--- a/lib/ey-core/version.rb
+++ b/lib/ey-core/version.rb
@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "3.6.4"
+    VERSION = "3.6.5"
   end
 end