diff --git a/lib/modules/msfclient.rb b/lib/modules/msfclient.rb
index d7787e2d2..7eab5dab2 100644
--- a/lib/modules/msfclient.rb
+++ b/lib/modules/msfclient.rb
@@ -5,27 +5,74 @@ module BeEF
   #
 	class MsfClient < ::XMLRPC::Client
 
-		attr_accessor :token
-    
+	  def initialize
+			@config = BeEF::Configuration.instance
+			@enabled = (@config.get('enable_msf').to_i > 0)
+		  return if (not @enabled)
+			host = @config.get('msf_host')
+			path = @config.get('msf_path')
+			port = @config.get('msf_port')
+			@un = @config.get('msf_user')
+			@pw = @config.get('msf_pass')
+
+			if(not host or not path or not port or not @un or not @pw)
+				raise RuntimeError, "#{@enabled}:Insufficient information to initliaze Metasploit"
+				@enabled = false
+			end
+
+			@token = nil
+			@lastauth = nil
+
+			super(host,path,port)
+
+
+	  end	
+		
+		# is metasploit enabled in the configuration
+		def is_enabled
+			@enabled	
+		end
+
     # login into metasploit
-		def login(user,pass)
-			res = self.call("auth.login", user, pass)
-			if(not (res and res['result'] == "success")) raise RuntimeError, "MSF Authentication failed"
-			self.token = res['token']
+		def login
+			res = self.call("auth.login", @un ,@pw )
+		 	raise RuntimeError, "MSF Authentication failed" if(not (res and res['result'] == "success")) 
+			@token = res['token']
+			@lastauth = Time.now
 			
 			true
+
 		end
     
     # sends commands to the metasploit xml rpc server
 		def call(meth, *args)
 			if(meth != "auth.login")
-				if(not self.token) raise RuntimeError, "client not authenticated"
-				args.unshift(self.token)
+				raise RuntimeError, "client not authenticated" if(not @token)  
+				args.unshift(@token)
 			end
 			
 			super(meth, *args)
 		end
 
+		def browser_exploits()
+				res = self.call('module.exploits')
+				raise RuntimeError, "Metasploit exploit retreval failed" if(not res['modules'])  
+				mods = res['modules']
+				ret = []
+				mods.each do |m|
+					ret << m if(m.include? '/browser/')
+				end
+				ret.sort
+		end
+
+		def get_exploit_info(name)
+			res = self.call('module.info','exploit',name)
+			res
+		end
+		def get_payloads(name)
+			res = self.call('module.compatible_payloads',name)
+			res
+		end
 	end
 	
 end