diff --git a/.fog b/.fog
deleted file mode 100644
index 385a50b02..000000000
--- a/.fog
+++ /dev/null
@@ -1,53 +0,0 @@
-:default:
-  :aws_access_key_id:
-  :aws_secret_access_key:
-  :bluebox_api_key:
-  :bluebox_customer_id:
-  :brightbox_client_id:
-  :brightbox_secret:
-  :clodo_api_key:
-  :clodo_username:
-  :go_grid_api_key:
-  :go_grid_shared_secret:
-  :google_storage_access_key_id:
-  :google_storage_secret_access_key:
-  :linode_api_key:
-  :local_root:
-  :new_servers_password:
-  :new_servers_username:
-  :public_key_path:
-  :private_key_path:
-  :openstack_api_key:
-  :openstack_username:
-  :openstack_auth_url:
-  :openstack_tenant:
-  :ovirt_username:
-  :ovirt_password:
-  :ovirt_url:
-  :rackspace_api_key:
-  :rackspace_username:
-  :rackspace_servicenet:
-  :rackspace_cdn_ssl:
-  :slicehost_password:
-  :stormondemand_username:
-  :stormondemand_password:
-  :terremark_username:
-  :terremark_password:
-  :voxel_api_key:
-  :voxel_api_secret:
-  :zerigo_email:
-  :zerigo_token:
-  :dnsimple_email:
-  :dnsimple_password:
-  :dnsmadeeasy_api_key:
-  :dnsmadeeasy_secret_key:
-  :cloudstack_host:
-  :cloudstack_api_key:
-  :cloudstack_secret_access_key:
-  :vsphere_server:
-  :vsphere_username:
-  :vsphere_password:
-  :libvirt_username:
-  :libvirt_password:
-  :libvirt_uri:
-  :libvirt_ip_command:
diff --git a/.gitignore b/.gitignore
index c9eb04db6..cc588ee8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 bin/*
 !bin/fog
 !bin/rdoc
+.fog
 coverage
 doc/*
 docs/_site/*
diff --git a/.irbrc b/.irbrc
new file mode 100644
index 000000000..5e5dda6c2
--- /dev/null
+++ b/.irbrc
@@ -0,0 +1,43 @@
+require 'fog'
+
+class ConnectionManager < Hash
+  def [](key)
+    $connection_manager_previous_key = key
+    super(key)
+  end
+
+  def []=(key, value)
+    $connection_manager_previous_key = key
+    super(key, value)
+  end
+end
+
+def connections
+  return @connections if @connections
+  @connections = ConnectionManager.new
+end
+
+def connection
+  connections[$connection_manager_previous_key]
+end
+
+def connect(username, password, tenant = nil, url = 'http://192.168.27.100:35357/')
+  parameters = {
+    :provider => 'openstack',
+    :openstack_api_key => password,
+    :openstack_username => username,
+    :openstack_auth_url => "#{url}v2.0/tokens"
+  }
+
+  parameters.merge!(:openstack_tenant => tenant) if tenant
+
+  identity = Fog::Identity.new(parameters)
+  compute = Fog::Compute.new(parameters)
+  image = Fog::Image.new(parameters)
+
+  connections[username.to_sym] = {
+    :identity => identity,
+    :compute  => compute ,
+    :image    => image
+  }
+end
diff --git a/lib/fog.rb b/lib/fog.rb
index 49f900e5f..417b88173 100644
--- a/lib/fog.rb
+++ b/lib/fog.rb
@@ -13,6 +13,7 @@ require 'fog/providers'
 require 'fog/terremark'
 
 require 'fog/compute'
+require 'fog/identity'
 require 'fog/cdn'
 require 'fog/dns'
 require 'fog/storage'
diff --git a/lib/fog/identity.rb b/lib/fog/identity.rb
new file mode 100644
index 000000000..ad96fc5e2
--- /dev/null
+++ b/lib/fog/identity.rb
@@ -0,0 +1,24 @@
+module Fog
+  module Identity
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup # Prevent delete from having side effects
+      case provider = attributes.delete(:provider).to_s.downcase.to_sym
+      when :openstack
+        require 'fog/openstack/identity'
+        Fog::Identity::OpenStack.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} has no identity service")
+      end
+    end
+
+    def self.providers
+      Fog.services[:idenity]
+    end
+
+  end
+end
diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb
index 1a5f7c91c..d7788293b 100644
--- a/lib/fog/openstack.rb
+++ b/lib/fog/openstack.rb
@@ -41,7 +41,8 @@ module Fog
       end
     end
 
-    service(:compute,         'openstack/compute',        'Compute')
+    service(:compute , 'openstack/compute' , 'Compute' )
+    service(:identity, 'openstack/identity', 'Identity')
 
     # legacy v1.0 style auth
     def self.authenticate_v1(options, connection_options = {})
@@ -87,7 +88,8 @@ module Fog
       req_body['auth']['tenantName'] = @openstack_tenant if @openstack_tenant
 
       body = retrieve_tokens_v2(connection, req_body, uri)
-      svc = body['access']['serviceCatalog'].detect{|x| x['name'] == @compute_service_name}
+      svc = body['access']['serviceCatalog'].
+        detect{|x| @compute_service_name.include?(x['type']) }
 
       unless svc
         unless @openstack_tenant
@@ -106,7 +108,7 @@ module Fog
 
         body = retrieve_tokens_v2(connection, req_body, uri)
         svc = body['access']['serviceCatalog'].
-          detect {|x| x['endpoints'].detect{|y| y['publicURL'].match(/(1\.1|2\.0)/) } }
+          detect{|x| @compute_service_name.include?(x['type']) }
       end
 
       mgmt_url = svc['endpoints'].detect{|x| x['publicURL']}['publicURL']
diff --git a/lib/fog/openstack/compute.rb b/lib/fog/openstack/compute.rb
index 00f46a272..e77bcd666 100644
--- a/lib/fog/openstack/compute.rb
+++ b/lib/fog/openstack/compute.rb
@@ -7,7 +7,8 @@ module Fog
     class OpenStack < Fog::Service
 
       requires :openstack_api_key, :openstack_username, :openstack_auth_url
-      recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_compute_service_name, :openstack_tenant
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_compute_service_name, :openstack_tenant
 
       model_path 'fog/openstack/models/compute'
       model       :address
@@ -148,7 +149,7 @@ module Fog
           @openstack_auth_token = options[:openstack_auth_token]
           @openstack_management_url       = options[:openstack_management_url]
           @openstack_must_reauthenticate  = false
-          @openstack_compute_service_name = options[:openstack_compute_service_name] || 'nova'
+          @openstack_compute_service_name = options[:openstack_compute_service_name] || ['nova', 'compute']
 
           @connection_options = options[:connection_options] || {}
 
diff --git a/lib/fog/openstack/identity.rb b/lib/fog/openstack/identity.rb
index 4948e975c..ca050fa86 100644
--- a/lib/fog/openstack/identity.rb
+++ b/lib/fog/openstack/identity.rb
@@ -6,30 +6,30 @@ module Fog
     class OpenStack < Fog::Service
 
       requires :openstack_api_key, :openstack_username, :openstack_auth_url
-      recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_compute_service_name, :openstack_tenant
+      recognizes :openstack_auth_token, :openstack_management_url, :persistent,
+                 :openstack_compute_service_name, :openstack_tenant
 
-      # model_path 'fog/openstack/models/identity'
+      model_path 'fog/openstack/models/identity'
       # model       :tenant
       # collection  :tenants
       # model       :user
       # collection  :users
-      
-
-      
 
       request_path 'fog/openstack/requests/identity'
+
       request :check_token
+      request :validate_token
+
       request :get_tenants
       request :get_tenants_by_id
       request :get_tenants_by_name
+
       request :get_user_by_id
       request :get_user_by_name
+
       request :list_endpoints_for_token
       request :list_roles_for_user_on_tenant
       request :list_user_global_roles
-      request :validate_tokens
-      
-      
 
       class Mock
 
@@ -41,16 +41,20 @@ module Fog
 
         def initialize(options={})
           require 'multi_json'
-          @openstack_api_key = options[:openstack_api_key]
+
+          @openstack_api_key  = options[:openstack_api_key]
           @openstack_username = options[:openstack_username]
-          @openstack_tenant = options[:openstack_tenant]
-          @openstack_compute_service_name = options[:openstack_compute_service_name] || 'nova'
-          @openstack_auth_url = options[:openstack_auth_url]
+          @openstack_tenant   = options[:openstack_tenant]
+          @openstack_auth_uri   = URI.parse(options[:openstack_auth_url])
           @openstack_auth_token = options[:openstack_auth_token]
-          @openstack_management_url = options[:openstack_management_url]
-          @openstack_must_reauthenticate = false
+          @openstack_management_url       = options[:openstack_management_url]
+          @openstack_must_reauthenticate  = false
+          @openstack_compute_service_name = options[:openstack_compute_service_name] || ['identity']
+
           @connection_options = options[:connection_options] || {}
+
           authenticate
+
           @persistent = options[:persistent] || false
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
@@ -99,25 +103,28 @@ module Fog
             options = {
               :openstack_api_key  => @openstack_api_key,
               :openstack_username => @openstack_username,
-              :openstack_auth_url => @openstack_auth_url,
-              :openstack_tenant => @openstack_tenant,
+              :openstack_auth_uri => @openstack_auth_uri,
+              :openstack_tenant   => @openstack_tenant,
+              :openstack_compute_service_name => @openstack_compute_service_name
             }
-            
+
             credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
-            
+
+            @openstack_must_reauthenticate = false
             @auth_token = credentials[:token]
-            
-            url = @openstack_auth_url
-            uri = URI.parse(url)
+            @openstack_management_url = credentials[:server_management_url]
+            uri = URI.parse(@openstack_management_url)
           else
             @auth_token = @openstack_auth_token
             uri = URI.parse(@openstack_management_url)
           end
+
           @host   = uri.host
           @path   = uri.path
           @path.sub!(/\/$/, '')
           @port   = uri.port
           @scheme = uri.scheme
+          true
         end
 
       end
diff --git a/lib/fog/openstack/requests/identity/check_token.rb b/lib/fog/openstack/requests/identity/check_token.rb
index d3e5c7b1f..f208c5848 100644
--- a/lib/fog/openstack/requests/identity/check_token.rb
+++ b/lib/fog/openstack/requests/identity/check_token.rb
@@ -1,18 +1,14 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def check_token(token_id, tenant_id)
-          
           request(
             :expects  => [200, 203],
             :method   => 'HEAD',
-            :path     => "tokens/#{token_id}​?belongsTo=#{tenant_id}"
+            :path     => "tokens/#{token_id}?belongsTo=#{tenant_id}"
           )
-
-          # TODO: Handle 404
-
         end
 
       end
diff --git a/lib/fog/openstack/requests/identity/get_tenants.rb b/lib/fog/openstack/requests/identity/get_tenants.rb
index 3e52b59b6..e43a77227 100644
--- a/lib/fog/openstack/requests/identity/get_tenants.rb
+++ b/lib/fog/openstack/requests/identity/get_tenants.rb
@@ -1,10 +1,9 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def get_tenants
-          
           request(
             :expects  => [200],
             :method   => 'GET',
diff --git a/lib/fog/openstack/requests/identity/get_tenants_by_id.rb b/lib/fog/openstack/requests/identity/get_tenants_by_id.rb
index f3b6154f3..01489e8d1 100644
--- a/lib/fog/openstack/requests/identity/get_tenants_by_id.rb
+++ b/lib/fog/openstack/requests/identity/get_tenants_by_id.rb
@@ -1,10 +1,9 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def get_tenants_by_id(tenant_id)
-          
           request(
             :expects  => [200],
             :method   => 'GET',
diff --git a/lib/fog/openstack/requests/identity/get_tenants_by_name.rb b/lib/fog/openstack/requests/identity/get_tenants_by_name.rb
index eafec59c5..42fd01943 100644
--- a/lib/fog/openstack/requests/identity/get_tenants_by_name.rb
+++ b/lib/fog/openstack/requests/identity/get_tenants_by_name.rb
@@ -1,10 +1,9 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def get_tenants_by_name(name)
-          
           request(
             :expects  => [200],
             :method   => 'GET',
diff --git a/lib/fog/openstack/requests/identity/get_user_by_id.rb b/lib/fog/openstack/requests/identity/get_user_by_id.rb
index c6431fdc7..8aaa4ce5b 100644
--- a/lib/fog/openstack/requests/identity/get_user_by_id.rb
+++ b/lib/fog/openstack/requests/identity/get_user_by_id.rb
@@ -1,10 +1,9 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def get_user_by_id(user_id)
-          
           request(
             :expects  => [200, 203],
             :method   => 'GET',
diff --git a/lib/fog/openstack/requests/identity/get_user_by_name.rb b/lib/fog/openstack/requests/identity/get_user_by_name.rb
index 580b08a5c..7cb4cb77f 100644
--- a/lib/fog/openstack/requests/identity/get_user_by_name.rb
+++ b/lib/fog/openstack/requests/identity/get_user_by_name.rb
@@ -1,10 +1,9 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def get_user_by_name(name)
-          
           request(
             :expects  => [200, 203],
             :method   => 'GET',
diff --git a/lib/fog/openstack/requests/identity/list_endpoints_for_token.rb b/lib/fog/openstack/requests/identity/list_endpoints_for_token.rb
index 66f0d9d03..916ef1007 100644
--- a/lib/fog/openstack/requests/identity/list_endpoints_for_token.rb
+++ b/lib/fog/openstack/requests/identity/list_endpoints_for_token.rb
@@ -1,16 +1,14 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def list_endpoints_for_token(token_id)
-          
           request(
             :expects  => [200, 203],
             :method   => 'HEAD',
-            :path     => "tokens/#{token_id}​/endpoints"
+            :path     => "tokens/#{token_id}/endpoints"
           )
-
         end
 
       end
diff --git a/lib/fog/openstack/requests/identity/list_roles_for_user_on_tenant.rb b/lib/fog/openstack/requests/identity/list_roles_for_user_on_tenant.rb
index 0060be434..cd8d4a2de 100644
--- a/lib/fog/openstack/requests/identity/list_roles_for_user_on_tenant.rb
+++ b/lib/fog/openstack/requests/identity/list_roles_for_user_on_tenant.rb
@@ -1,10 +1,9 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def list_roles_for_user_on_tenant(tenant_id, user_id)
-          
           request(
             :expects  => [200],
             :method   => 'GET',
diff --git a/lib/fog/openstack/requests/identity/list_user_global_roles.rb b/lib/fog/openstack/requests/identity/list_user_global_roles.rb
index aacd32d1b..8c089227e 100644
--- a/lib/fog/openstack/requests/identity/list_user_global_roles.rb
+++ b/lib/fog/openstack/requests/identity/list_user_global_roles.rb
@@ -1,17 +1,15 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def list_user_global_roles(user_id)
-          
           request(
             :expects  => [200],
             :method   => 'GET',
             :path     => "users/#{user_id}/roles"
           )
         end
-
       end
 
       class Mock
diff --git a/lib/fog/openstack/requests/identity/validate_token.rb b/lib/fog/openstack/requests/identity/validate_token.rb
index 8239c3287..4e676c2a8 100644
--- a/lib/fog/openstack/requests/identity/validate_token.rb
+++ b/lib/fog/openstack/requests/identity/validate_token.rb
@@ -1,18 +1,14 @@
 module Fog
   module Identity
-    class Openstack
+    class OpenStack
       class Real
 
         def validate_token(token_id, tenant_id)
-          
           request(
             :expects  => [200, 203],
             :method   => 'GET',
-            :path     => "tokens/#{token_id}​?belongsTo=#{tenant_id}"
+            :path     => "tokens/#{token_id}?belongsTo=#{tenant_id}"
           )
-
-          # TODO: Handle 404
-          
         end
 
       end