diff --git a/lib/modules/python/collection/osx/browser_dump.py b/lib/modules/python/collection/osx/browser_dump.py
index 69aa225..f0585b8 100644
--- a/lib/modules/python/collection/osx/browser_dump.py
+++ b/lib/modules/python/collection/osx/browser_dump.py
@@ -69,7 +69,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         number = self.options['Number']['Value']
 
diff --git a/lib/modules/python/collection/osx/clipboard.py b/lib/modules/python/collection/osx/clipboard.py
index 720c7f7..01e4e3e 100644
--- a/lib/modules/python/collection/osx/clipboard.py
+++ b/lib/modules/python/collection/osx/clipboard.py
@@ -74,7 +74,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         outFile = self.options['OutFile']['Value']
         monitorTime = self.options['MonitorTime']['Value']
diff --git a/lib/modules/python/collection/osx/hashdump.py b/lib/modules/python/collection/osx/hashdump.py
index 90537ea..0f94f29 100644
--- a/lib/modules/python/collection/osx/hashdump.py
+++ b/lib/modules/python/collection/osx/hashdump.py
@@ -66,7 +66,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         script = """
 import os
diff --git a/lib/modules/python/collection/osx/imessage_dump.py b/lib/modules/python/collection/osx/imessage_dump.py
index 1f46337..a08abee 100644
--- a/lib/modules/python/collection/osx/imessage_dump.py
+++ b/lib/modules/python/collection/osx/imessage_dump.py
@@ -84,7 +84,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         count = self.options['Messages']['Value']
         script = "count = " + str(count) + '\n'
         if self.options['Debug']['Value']:
diff --git a/lib/modules/python/collection/osx/kerberosdump.py b/lib/modules/python/collection/osx/kerberosdump.py
index ba2f4cf..da1edaf 100644
--- a/lib/modules/python/collection/osx/kerberosdump.py
+++ b/lib/modules/python/collection/osx/kerberosdump.py
@@ -68,7 +68,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         script = """
 import subprocess
diff --git a/lib/modules/python/collection/osx/keychaindump_chainbreaker.py b/lib/modules/python/collection/osx/keychaindump_chainbreaker.py
index 920e657..eef37ec 100644
--- a/lib/modules/python/collection/osx/keychaindump_chainbreaker.py
+++ b/lib/modules/python/collection/osx/keychaindump_chainbreaker.py
@@ -82,7 +82,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         keyChain = self.options['KeyChain']['Value']
         password = self.options['Password']['Value']
diff --git a/lib/modules/python/collection/osx/keylogger.py b/lib/modules/python/collection/osx/keylogger.py
index 215ab20..b0d84ac 100644
--- a/lib/modules/python/collection/osx/keylogger.py
+++ b/lib/modules/python/collection/osx/keylogger.py
@@ -69,7 +69,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         logFile = self.options['LogFile']['Value']
 
diff --git a/lib/modules/python/collection/osx/native_screenshot.py b/lib/modules/python/collection/osx/native_screenshot.py
index ad3cf5f..aa81ae4 100644
--- a/lib/modules/python/collection/osx/native_screenshot.py
+++ b/lib/modules/python/collection/osx/native_screenshot.py
@@ -62,7 +62,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         script = """
 try:
diff --git a/lib/modules/python/collection/osx/pillage_user.py b/lib/modules/python/collection/osx/pillage_user.py
index f462c73..a2b0ee5 100644
--- a/lib/modules/python/collection/osx/pillage_user.py
+++ b/lib/modules/python/collection/osx/pillage_user.py
@@ -78,7 +78,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         sleep = self.options['Sleep']['Value']
         allUsers = self.options['AllUsers']['Value']
diff --git a/lib/modules/python/collection/osx/prompt.py b/lib/modules/python/collection/osx/prompt.py
index f657f7e..d4b4f61 100644
--- a/lib/modules/python/collection/osx/prompt.py
+++ b/lib/modules/python/collection/osx/prompt.py
@@ -82,7 +82,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         listApps = self.options['ListApps']['Value']
         appName = self.options['AppName']['Value']
diff --git a/lib/modules/python/collection/osx/screensaver_alleyoop.py b/lib/modules/python/collection/osx/screensaver_alleyoop.py
index 395059b..70947a9 100644
--- a/lib/modules/python/collection/osx/screensaver_alleyoop.py
+++ b/lib/modules/python/collection/osx/screensaver_alleyoop.py
@@ -81,7 +81,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         exitCount = self.options['ExitCount']['Value']
         verbose = self.options['Verbose']['Value']
diff --git a/lib/modules/python/collection/osx/screenshot.py b/lib/modules/python/collection/osx/screenshot.py
index e3ec6b5..fe20a00 100644
--- a/lib/modules/python/collection/osx/screenshot.py
+++ b/lib/modules/python/collection/osx/screenshot.py
@@ -67,7 +67,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         savePath = self.options['SavePath']['Value']
 
diff --git a/lib/modules/python/collection/osx/search_email.py b/lib/modules/python/collection/osx/search_email.py
index 1b13c65..f11f9ed 100644
--- a/lib/modules/python/collection/osx/search_email.py
+++ b/lib/modules/python/collection/osx/search_email.py
@@ -71,7 +71,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         searchTerm = self.options['SearchTerm']['Value']
 
diff --git a/lib/modules/python/collection/osx/sniffer.py b/lib/modules/python/collection/osx/sniffer.py
index 58d3ee7..9153c63 100644
--- a/lib/modules/python/collection/osx/sniffer.py
+++ b/lib/modules/python/collection/osx/sniffer.py
@@ -99,7 +99,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         script = '\n'
         for item in self.info['Imports']:
             script += "import %s \n" % item
diff --git a/lib/modules/python/collection/osx/webcam.py b/lib/modules/python/collection/osx/webcam.py
index a496d8e..62ad581 100644
--- a/lib/modules/python/collection/osx/webcam.py
+++ b/lib/modules/python/collection/osx/webcam.py
@@ -69,7 +69,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         tempDir = self.options['TempDir']['Value']
         if not tempDir.endswith("/"):
diff --git a/lib/modules/python/exploit/web/jboss_jmx.py b/lib/modules/python/exploit/web/jboss_jmx.py
index 305dec3..6b88af6 100644
--- a/lib/modules/python/exploit/web/jboss_jmx.py
+++ b/lib/modules/python/exploit/web/jboss_jmx.py
@@ -72,7 +72,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         url = self.options['URL']['Value']
         payload = self.options['Payload']['Value']
diff --git a/lib/modules/python/lateral_movement/multi/ssh_command.py b/lib/modules/python/lateral_movement/multi/ssh_command.py
index 39ec4d2..a5eb69f 100644
--- a/lib/modules/python/lateral_movement/multi/ssh_command.py
+++ b/lib/modules/python/lateral_movement/multi/ssh_command.py
@@ -79,7 +79,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         login = self.options['Login']['Value']
         password = self.options['Password']['Value']
         command = self.options['Command']['Value']
diff --git a/lib/modules/python/lateral_movement/multi/ssh_launcher.py b/lib/modules/python/lateral_movement/multi/ssh_launcher.py
index 512c153..298f59b 100644
--- a/lib/modules/python/lateral_movement/multi/ssh_launcher.py
+++ b/lib/modules/python/lateral_movement/multi/ssh_launcher.py
@@ -89,7 +89,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         login = self.options['Login']['Value']
         password = self.options['Password']['Value']
         listenerName = self.options['Listener']['Value']
diff --git a/lib/modules/python/management/multi/kerberos_inject.py b/lib/modules/python/management/multi/kerberos_inject.py
index 1f1ae21..e184db4 100644
--- a/lib/modules/python/management/multi/kerberos_inject.py
+++ b/lib/modules/python/management/multi/kerberos_inject.py
@@ -80,7 +80,7 @@ class Module:
                     self.options[option]['Value'] = value
 
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         keytab = self.options['Keytab']['Value']
         principal = self.options['Principal']['Value']
         ntlmhash = self.options['Hash']['Value']
diff --git a/lib/modules/python/management/multi/socks.py b/lib/modules/python/management/multi/socks.py
index 9f719cc..99800fb 100644
--- a/lib/modules/python/management/multi/socks.py
+++ b/lib/modules/python/management/multi/socks.py
@@ -77,7 +77,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         module_path = os.path.join(self.mainMenu.installPath, 
             'data/module_source/python/lateral_movement/socks_source.py')
 
diff --git a/lib/modules/python/management/multi/spawn.py b/lib/modules/python/management/multi/spawn.py
index 7c303e4..2f05c46 100644
--- a/lib/modules/python/management/multi/spawn.py
+++ b/lib/modules/python/management/multi/spawn.py
@@ -74,7 +74,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         # extract all of our options
         listenerName = self.options['Listener']['Value']
diff --git a/lib/modules/python/management/osx/ls.py b/lib/modules/python/management/osx/ls.py
deleted file mode 100644
index 4eeddaa..0000000
--- a/lib/modules/python/management/osx/ls.py
+++ /dev/null
@@ -1,137 +0,0 @@
-from lib.common import helpers
-
-
-class Module:
-
-    def __init__(self, mainMenu, params=[]):
-
-        # metadata info about the module, not modified during runtime
-        self.info = {
-            # name for the module that will appear in module menus
-            'Name': 'ls',
-
-            # list of one or more authors for the module
-            'Author': ['@xorrior'],
-
-            # more verbose multi-line description of the module
-            'Description': ('List contents of a directory'),
-
-            # True if the module needs to run in the background
-            'Background': False,
-
-            # File extension to save the file as
-            # no need to base64 return data
-            'OutputExtension': None,
-
-            'NeedsAdmin' : False,
-
-            # True if the method doesn't touch disk/is reasonably opsec safe
-            'OpsecSafe': True,
-
-            # the module language
-            'Language' : 'python',
-
-            # the minimum language version needed
-            'MinLanguageVersion' : '2.6',
-
-            # list of any references/other comments
-            'Comments': [
-                'Link:',
-                'http://stackoverflow.com/questions/17809386/how-to-convert-a-stat-output-to-a-unix-permissions-string'
-            ]
-        }
-
-        # any options needed by the module, settable during runtime
-        self.options = {
-            # format:
-            #   value_name : {description, required, default_value}
-            'Agent': {
-                # The 'Agent' option is the only one that MUST be in a module
-                'Description'   :   'Agent to run the module.',
-                'Required'      :   True,
-                'Value'         :   ''
-            },
-            'Path': {
-                'Description'   :   'Path. Defaults to the current directory. This module is mainly for organization. The alias \'ls\' can be used at the agent menu.',
-                'Required'      :   True,
-                'Value'         :   '.'
-            }
-        }
-
-        # save off a copy of the mainMenu object to access external functionality
-        #   like listeners/agent handlers/etc.
-        self.mainMenu = mainMenu
-
-        # During instantiation, any settable option parameters
-        #   are passed as an object set to the module and the
-        #   options dictionary is automatically set. This is mostly
-        #   in case options are passed on the command line
-        if params:
-            for param in params:
-                # parameter format is [Name, Value]
-                option, value = param
-                if option in self.options:
-                    self.options[option]['Value'] = value
-
-    def generate(self):
-
-        filePath = self.options['Path']['Value']
-        filePath += '/'
-
-        script = """
-try:
-
-    import Foundation
-    from AppKit import *
-    import os
-    import stat
-except:
-    print "A required module is missing.."
-
-def permissions_to_unix_name(st_mode):
-    permstr = ''
-    usertypes = ['USR', 'GRP', 'OTH']
-    for usertype in usertypes:
-        perm_types = ['R', 'W', 'X']
-        for permtype in perm_types:
-            perm = getattr(stat, 'S_I%%s%%s' %% (permtype, usertype))
-            if st_mode & perm:
-                permstr += permtype.lower()
-            else:
-                permstr += '-'
-    return permstr
-
-path = "%s"
-dirlist = os.listdir(path)
-
-filemgr = NSFileManager.defaultManager()
-
-directoryListString = "\\t\\towner\\tgroup\\t\\tlast modified\\tsize\\t\\tname\\n"
-
-for item in dirlist:
-    fullpath = os.path.abspath(os.path.join(path,item))
-    attrs = filemgr.attributesOfItemAtPath_error_(os.path.abspath(fullpath), None)
-    name = item 
-    lastModified = str(attrs[0]['NSFileModificationDate'])
-    group = str(attrs[0]['NSFileGroupOwnerAccountName'])
-    owner = str(attrs[0]['NSFileOwnerAccountName'])
-    size = str(os.path.getsize(fullpath))
-    if int(size) > 1024:
-        size = int(size) / 1024
-        size = str(size) + "K"
-    else:
-        size += "B"
-    perms = permissions_to_unix_name(os.stat(fullpath)[0])
-    listString = perms + "  " + owner + "\\t" + group + "\\t\\t" + lastModified.split(" ")[0] + "\\t" + size + "\\t\\t" + name + "\\n"
-    if os.path.isdir(fullpath):
-        listString = "d"+listString
-    else:
-        listString = "-"+listString
-
-    directoryListString += listString
-
-print str(os.getcwd())
-print directoryListString
-""" % filePath
-
-        return script
diff --git a/lib/modules/python/management/osx/screen_sharing.py b/lib/modules/python/management/osx/screen_sharing.py
index cacdaf5..25a7016 100644
--- a/lib/modules/python/management/osx/screen_sharing.py
+++ b/lib/modules/python/management/osx/screen_sharing.py
@@ -74,7 +74,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
 
 
diff --git a/lib/modules/python/management/osx/shellcodeinject64.py b/lib/modules/python/management/osx/shellcodeinject64.py
index ca4c265..2631f21 100644
--- a/lib/modules/python/management/osx/shellcodeinject64.py
+++ b/lib/modules/python/management/osx/shellcodeinject64.py
@@ -79,7 +79,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         
         processID = self.options['PID']['Value']
diff --git a/lib/modules/python/persistence/multi/crontab.py b/lib/modules/python/persistence/multi/crontab.py
index 5073538..798a1a2 100644
--- a/lib/modules/python/persistence/multi/crontab.py
+++ b/lib/modules/python/persistence/multi/crontab.py
@@ -82,7 +82,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         Remove = self.options['Remove']['Value']
         Hourly = self.options['Hourly']['Value']
         Hour = self.options['Hour']['Value']
diff --git a/lib/modules/python/persistence/osx/CreateHijacker.py b/lib/modules/python/persistence/osx/CreateHijacker.py
index f4aa7a8..826e610 100644
--- a/lib/modules/python/persistence/osx/CreateHijacker.py
+++ b/lib/modules/python/persistence/osx/CreateHijacker.py
@@ -95,7 +95,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         # the Python script itself, with the command to invoke
         #   for execution appended to the end. Scripts should output
diff --git a/lib/modules/python/persistence/osx/RemoveDaemon.py b/lib/modules/python/persistence/osx/RemoveDaemon.py
index 3bf6e41..13b525f 100644
--- a/lib/modules/python/persistence/osx/RemoveDaemon.py
+++ b/lib/modules/python/persistence/osx/RemoveDaemon.py
@@ -76,7 +76,7 @@ class Module:
                     self.options[option]['Value'] = value
 
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         
         plistpath = self.options['PlistPath']['Value']
         programpath = self.options['ProgramPath']['Value']
diff --git a/lib/modules/python/persistence/osx/launchdaemonexecutable.py b/lib/modules/python/persistence/osx/launchdaemonexecutable.py
index 482dd3a..46a4b07 100644
--- a/lib/modules/python/persistence/osx/launchdaemonexecutable.py
+++ b/lib/modules/python/persistence/osx/launchdaemonexecutable.py
@@ -88,7 +88,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         daemonName = self.options['DaemonName']['Value']
         programname = self.options['DaemonLocation']['Value']
diff --git a/lib/modules/python/persistence/osx/loginhook.py b/lib/modules/python/persistence/osx/loginhook.py
index 31eae0e..0b3bd63 100644
--- a/lib/modules/python/persistence/osx/loginhook.py
+++ b/lib/modules/python/persistence/osx/loginhook.py
@@ -72,7 +72,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         loginhookScriptPath = self.options['LoginHookScript']['Value']
         password = self.options['Password']['Value']
diff --git a/lib/modules/python/persistence/osx/mail.py b/lib/modules/python/persistence/osx/mail.py
index 056a826..d2e7e5c 100644
--- a/lib/modules/python/persistence/osx/mail.py
+++ b/lib/modules/python/persistence/osx/mail.py
@@ -90,7 +90,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         ruleName = self.options['RuleName']['Value']
         trigger = self.options['Trigger']['Value']
diff --git a/lib/modules/python/privesc/linux/linux_priv_checker.py b/lib/modules/python/privesc/linux/linux_priv_checker.py
index bff6fa4..a804183 100644
--- a/lib/modules/python/privesc/linux/linux_priv_checker.py
+++ b/lib/modules/python/privesc/linux/linux_priv_checker.py
@@ -64,7 +64,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         ###############################################################################################################
         ## [Title]: linuxprivchecker.py -- a Linux Privilege Escalation Check Script
         ## [Author]: Mike Czumak (T_v3rn1x) -- @SecuritySift
diff --git a/lib/modules/python/privesc/linux/unix_privesc_check.py b/lib/modules/python/privesc/linux/unix_privesc_check.py
index 61d2112..f0823ce 100644
--- a/lib/modules/python/privesc/linux/unix_privesc_check.py
+++ b/lib/modules/python/privesc/linux/unix_privesc_check.py
@@ -84,7 +84,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         ip = self.options['Ip']['Value']
         port = self.options['Port']['Value']
         serveCount = self.options['ServeCount']['Value']
diff --git a/lib/modules/python/privesc/multi/bashdoor.py b/lib/modules/python/privesc/multi/bashdoor.py
index 8d5cec0..401d4ac 100644
--- a/lib/modules/python/privesc/multi/bashdoor.py
+++ b/lib/modules/python/privesc/multi/bashdoor.py
@@ -76,7 +76,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         # extract all of our options
         listenerName = self.options['Listener']['Value']
diff --git a/lib/modules/python/privesc/multi/sudo_spawn.py b/lib/modules/python/privesc/multi/sudo_spawn.py
index 02d23b3..fbece19 100644
--- a/lib/modules/python/privesc/multi/sudo_spawn.py
+++ b/lib/modules/python/privesc/multi/sudo_spawn.py
@@ -84,7 +84,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         # extract all of our options
         listenerName = self.options['Listener']['Value']
diff --git a/lib/modules/python/privesc/osx/dyld_print_to_file.py b/lib/modules/python/privesc/osx/dyld_print_to_file.py
index 36b81c7..b1eb7c7 100644
--- a/lib/modules/python/privesc/osx/dyld_print_to_file.py
+++ b/lib/modules/python/privesc/osx/dyld_print_to_file.py
@@ -95,7 +95,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         # the Python script itself, with the command to invoke
         #   for execution appended to the end. Scripts should output
diff --git a/lib/modules/python/privesc/osx/piggyback.py b/lib/modules/python/privesc/osx/piggyback.py
index 3cbff1f..d71dcaf 100644
--- a/lib/modules/python/privesc/osx/piggyback.py
+++ b/lib/modules/python/privesc/osx/piggyback.py
@@ -79,7 +79,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         # extract all of our options
         listenerName = self.options['Listener']['Value']
diff --git a/lib/modules/python/situational_awareness/host/multi/SuidGuidSearch.py b/lib/modules/python/situational_awareness/host/multi/SuidGuidSearch.py
index 5dacb0d..465ff5d 100644
--- a/lib/modules/python/situational_awareness/host/multi/SuidGuidSearch.py
+++ b/lib/modules/python/situational_awareness/host/multi/SuidGuidSearch.py
@@ -71,7 +71,7 @@ class Module:
                     self.options[option]['Value'] = value
 
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         
         # the Python script itself, with the command to invoke
         #   for execution appended to the end. Scripts should output
diff --git a/lib/modules/python/situational_awareness/host/multi/WorldWriteableFileSearch.py b/lib/modules/python/situational_awareness/host/multi/WorldWriteableFileSearch.py
index f198c6a..7e094bf 100644
--- a/lib/modules/python/situational_awareness/host/multi/WorldWriteableFileSearch.py
+++ b/lib/modules/python/situational_awareness/host/multi/WorldWriteableFileSearch.py
@@ -71,7 +71,7 @@ class Module:
                     self.options[option]['Value'] = value
 
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         
         # the Python script itself, with the command to invoke
         #   for execution appended to the end. Scripts should output
diff --git a/lib/modules/python/situational_awareness/host/osx/HijackScanner.py b/lib/modules/python/situational_awareness/host/osx/HijackScanner.py
index 1166392..b62cb21 100644
--- a/lib/modules/python/situational_awareness/host/osx/HijackScanner.py
+++ b/lib/modules/python/situational_awareness/host/osx/HijackScanner.py
@@ -76,7 +76,7 @@ class Module:
                     self.options[option]['Value'] = value
 
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         
         # the Python script itself, with the command to invoke
         #   for execution appended to the end. Scripts should output
diff --git a/lib/modules/python/situational_awareness/host/osx/situational_awareness.py b/lib/modules/python/situational_awareness/host/osx/situational_awareness.py
index bccaddb..d00ab4e 100644
--- a/lib/modules/python/situational_awareness/host/osx/situational_awareness.py
+++ b/lib/modules/python/situational_awareness/host/osx/situational_awareness.py
@@ -75,7 +75,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         script = ''
         if self.options['Debug']['Value']:
             debug = self.options['Debug']['Value']
diff --git a/lib/modules/python/situational_awareness/network/active_directory/dscl_get_groupmembers.py b/lib/modules/python/situational_awareness/network/active_directory/dscl_get_groupmembers.py
index e0ce439..c275401 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/dscl_get_groupmembers.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/dscl_get_groupmembers.py
@@ -68,7 +68,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         group = self.options['Group']['Value']
         # the Python script itself, with the command to invoke
diff --git a/lib/modules/python/situational_awareness/network/active_directory/dscl_get_groups.py b/lib/modules/python/situational_awareness/network/active_directory/dscl_get_groups.py
index 63bf646..6b9afe0 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/dscl_get_groups.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/dscl_get_groups.py
@@ -68,7 +68,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         domain = self.options['Domain']['Value']
         # the Python script itself, with the command to invoke
diff --git a/lib/modules/python/situational_awareness/network/active_directory/dscl_get_users.py b/lib/modules/python/situational_awareness/network/active_directory/dscl_get_users.py
index 46c6124..8f88723 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/dscl_get_users.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/dscl_get_users.py
@@ -68,7 +68,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         domain = self.options['Domain']['Value']
         # the Python script itself, with the command to invoke
diff --git a/lib/modules/python/situational_awareness/network/active_directory/get_computers.py b/lib/modules/python/situational_awareness/network/active_directory/get_computers.py
index e111527..4057dc5 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/get_computers.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/get_computers.py
@@ -80,7 +80,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         LDAPAddress = self.options['LDAPAddress']['Value']
         BindDN = self.options['BindDN']['Value']
diff --git a/lib/modules/python/situational_awareness/network/active_directory/get_domaincontrollers.py b/lib/modules/python/situational_awareness/network/active_directory/get_domaincontrollers.py
index ee30d89..f6ad486 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/get_domaincontrollers.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/get_domaincontrollers.py
@@ -80,7 +80,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         LDAPAddress = self.options['LDAPAddress']['Value']
         BindDN = self.options['BindDN']['Value']
diff --git a/lib/modules/python/situational_awareness/network/active_directory/get_fileservers.py b/lib/modules/python/situational_awareness/network/active_directory/get_fileservers.py
index c8c7eb2..cba8da7 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/get_fileservers.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/get_fileservers.py
@@ -80,7 +80,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         LDAPAddress = self.options['LDAPAddress']['Value']
         BindDN = self.options['BindDN']['Value']
diff --git a/lib/modules/python/situational_awareness/network/active_directory/get_groupmembers.py b/lib/modules/python/situational_awareness/network/active_directory/get_groupmembers.py
index 4632cbe..1eadd05 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/get_groupmembers.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/get_groupmembers.py
@@ -86,7 +86,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         LDAPAddress = self.options['LDAPAddress']['Value']
         BindDN = self.options['BindDN']['Value']
diff --git a/lib/modules/python/situational_awareness/network/active_directory/get_groupmemberships.py b/lib/modules/python/situational_awareness/network/active_directory/get_groupmemberships.py
index f9b8252..4fbf550 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/get_groupmemberships.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/get_groupmemberships.py
@@ -86,7 +86,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         LDAPAddress = self.options['LDAPAddress']['Value']
         BindDN = self.options['BindDN']['Value']
diff --git a/lib/modules/python/situational_awareness/network/active_directory/get_groups.py b/lib/modules/python/situational_awareness/network/active_directory/get_groups.py
index 0517652..1eb4da2 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/get_groups.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/get_groups.py
@@ -80,7 +80,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         LDAPAddress = self.options['LDAPAddress']['Value']
         BindDN = self.options['BindDN']['Value']
diff --git a/lib/modules/python/situational_awareness/network/active_directory/get_ous.py b/lib/modules/python/situational_awareness/network/active_directory/get_ous.py
index 0ad21cf..7018848 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/get_ous.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/get_ous.py
@@ -80,7 +80,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         LDAPAddress = self.options['LDAPAddress']['Value']
         BindDN = self.options['BindDN']['Value']
diff --git a/lib/modules/python/situational_awareness/network/active_directory/get_userinformation.py b/lib/modules/python/situational_awareness/network/active_directory/get_userinformation.py
index a1a2864..e9a026f 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/get_userinformation.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/get_userinformation.py
@@ -86,7 +86,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         LDAPAddress = self.options['LDAPAddress']['Value']
         BindDN = self.options['BindDN']['Value']
diff --git a/lib/modules/python/situational_awareness/network/active_directory/get_users.py b/lib/modules/python/situational_awareness/network/active_directory/get_users.py
index 0188ddd..aed043f 100644
--- a/lib/modules/python/situational_awareness/network/active_directory/get_users.py
+++ b/lib/modules/python/situational_awareness/network/active_directory/get_users.py
@@ -80,7 +80,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         LDAPAddress = self.options['LDAPAddress']['Value']
         BindDN = self.options['BindDN']['Value']
diff --git a/lib/modules/python/situational_awareness/network/find_fruit.py b/lib/modules/python/situational_awareness/network/find_fruit.py
index c4b1e70..57efe30 100644
--- a/lib/modules/python/situational_awareness/network/find_fruit.py
+++ b/lib/modules/python/situational_awareness/network/find_fruit.py
@@ -83,7 +83,7 @@ class Module:
                     self.options[option]['Value'] = value
 
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         target = self.options['Target']['Value']
         port = self.options['Port']['Value']
         ssl = self.options['SSL']['Value']
diff --git a/lib/modules/python/situational_awareness/network/gethostbyname.py b/lib/modules/python/situational_awareness/network/gethostbyname.py
index 3258594..92ba763 100644
--- a/lib/modules/python/situational_awareness/network/gethostbyname.py
+++ b/lib/modules/python/situational_awareness/network/gethostbyname.py
@@ -70,7 +70,7 @@ class Module:
                     self.options[option]['Value'] = value
 
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         target = self.options['Target']['Value']
         
 
diff --git a/lib/modules/python/situational_awareness/network/http_rest_api.py b/lib/modules/python/situational_awareness/network/http_rest_api.py
index 63cfc6d..c471ade 100644
--- a/lib/modules/python/situational_awareness/network/http_rest_api.py
+++ b/lib/modules/python/situational_awareness/network/http_rest_api.py
@@ -95,7 +95,7 @@ class Module:
                     self.options[option]['Value'] = value
 
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         protocol = self.options['Protocol']['Value']
         target = self.options['Target']['Value']
         port = self.options['Port']['Value']
diff --git a/lib/modules/python/situational_awareness/network/port_scan.py b/lib/modules/python/situational_awareness/network/port_scan.py
index 3170cbc..a840bc8 100644
--- a/lib/modules/python/situational_awareness/network/port_scan.py
+++ b/lib/modules/python/situational_awareness/network/port_scan.py
@@ -77,7 +77,7 @@ class Module:
                     self.options[option]['Value'] = value
 
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
         target = self.options['Target']['Value']
         port = self.options['Port']['Value']
         
diff --git a/lib/modules/python/situational_awareness/network/smb_mount.py b/lib/modules/python/situational_awareness/network/smb_mount.py
index 248be29..b4be951 100644
--- a/lib/modules/python/situational_awareness/network/smb_mount.py
+++ b/lib/modules/python/situational_awareness/network/smb_mount.py
@@ -98,7 +98,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         domain = self.options['Domain']['Value']
         username = self.options['UserName']['Value']
diff --git a/lib/modules/python/trollsploit/osx/change_background.py b/lib/modules/python/trollsploit/osx/change_background.py
index 84a8903..c68e5a7 100644
--- a/lib/modules/python/trollsploit/osx/change_background.py
+++ b/lib/modules/python/trollsploit/osx/change_background.py
@@ -81,7 +81,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         image = self.options['Image']['Value']
         desktop = self.options['Desktop']['Value']
diff --git a/lib/modules/python/trollsploit/osx/login_message.py b/lib/modules/python/trollsploit/osx/login_message.py
index 15dd293..0689dbf 100644
--- a/lib/modules/python/trollsploit/osx/login_message.py
+++ b/lib/modules/python/trollsploit/osx/login_message.py
@@ -74,7 +74,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         message = self.options['Message']['Value']
         remove = self.options['Remove']['Value']
diff --git a/lib/modules/python/trollsploit/osx/say.py b/lib/modules/python/trollsploit/osx/say.py
index 1be9b97..701d409 100644
--- a/lib/modules/python/trollsploit/osx/say.py
+++ b/lib/modules/python/trollsploit/osx/say.py
@@ -72,7 +72,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         voice = self.options['Voice']['Value']
         text = self.options['Text']['Value']
diff --git a/lib/modules/python/trollsploit/osx/thunderstruck.py b/lib/modules/python/trollsploit/osx/thunderstruck.py
index 7cd86a6..00bc468 100644
--- a/lib/modules/python/trollsploit/osx/thunderstruck.py
+++ b/lib/modules/python/trollsploit/osx/thunderstruck.py
@@ -62,7 +62,7 @@ class Module:
                 if option in self.options:
                     self.options[option]['Value'] = value
 
-    def generate(self):
+    def generate(self, obfuscate=False, obfuscationCommand=""):
 
         # the Python script itself, with the command to invoke
         #   for execution appended to the end. Scripts should output