diff --git a/sopel_SpiceBot_Core_1/SBCore/events/__init__.py b/sopel_SpiceBot_Core_1/SBCore/events/__init__.py
index 904a5a6..9c9bed8 100644
--- a/sopel_SpiceBot_Core_1/SBCore/events/__init__.py
+++ b/sopel_SpiceBot_Core_1/SBCore/events/__init__.py
@@ -6,7 +6,7 @@ We utilize the Sopel code for event numbers and
 self-trigger the bot into performing actions
 """
 
-import sopel
+from sopel.trigger import PreTrigger
 import functools
 import threading
 import time
@@ -71,7 +71,7 @@ class Events(object):
     def dispatch(self, bot, pretriggerdict):
         number = pretriggerdict["number"]
         message = pretriggerdict["message"]
-        pretrigger = sopel.trigger.PreTrigger(
+        pretrigger = PreTrigger(
             bot.nick,
             ":SpiceBot_Events %s %s :%s" % (number, bot.nick, message)
         )
diff --git a/sopel_SpiceBot_Runtime_Commands/__init__.py b/sopel_SpiceBot_Runtime_Commands/__init__.py
index 16cdc64..d04ac51 100644
--- a/sopel_SpiceBot_Runtime_Commands/__init__.py
+++ b/sopel_SpiceBot_Runtime_Commands/__init__.py
@@ -1,6 +1,7 @@
 
 
 from sopel import plugin
+from sopel.trigger import PreTrigger
 
 from sopel_SpiceBot_Core_1 import sb
 
@@ -52,6 +53,8 @@ def sopel_action_commands(bot, trigger):
 def commands_test_a(bot, trigger):
     bot.say("test a")
 
+    bot.say("%s" % trigger.hostmask)
+
     bot.say("test a: %s" % trigger.raw)
 
 
@@ -71,19 +74,21 @@ def commands_test_c(bot, trigger):
     bot.say("test c: %s" % trigger.raw)
 
     pretriggerdict = {
-        "message": ""
+        "message": "testa",
+        "number":  42
         }
 
-    sb.commands.dispatch(bot, trigger, pretriggerdict)
+    # sb.commands.dispatch(bot, trigger, pretriggerdict)
+    dispatch(bot, trigger, pretriggerdict)
 
 
 def dispatch(self, bot, trigger, pretriggerdict):
     # pretriggerdict = {"number": str(number), "message": message}
     number = pretriggerdict["number"]
     message = pretriggerdict["message"]
-    pretrigger = sopel.trigger.PreTrigger(
+    pretrigger = PreTrigger(
         bot.nick,
-        ":SpiceBot_Events %s %s :%s" % (number, bot.nick, message)
+        ":SpiceBot_Events %s :%s" % (number, bot.nick, message)
     )
     """
     :deathbybandaid!deathbyban@irc.spicebot.net PRIVMSG #spicebottest :.testa