diff --git a/golibs/bait/bait.go b/golibs/bait/bait.go
index dab6701..6e461dc 100644
--- a/golibs/bait/bait.go
+++ b/golibs/bait/bait.go
@@ -29,8 +29,8 @@ type Bait struct{
 	rtm *rt.Runtime
 }
 
-func New(rtm *rt.Runtime) Bait {
-	b := Bait{
+func New(rtm *rt.Runtime) *Bait {
+	b := &Bait{
 		handlers: make(map[string][]*Listener),
 		rtm: rtm,
 	}
diff --git a/golibs/commander/commander.go b/golibs/commander/commander.go
index d279e0c..24f1c03 100644
--- a/golibs/commander/commander.go
+++ b/golibs/commander/commander.go
@@ -2,20 +2,20 @@ package commander
 
 import (
 	"hilbish/util"
+	"hilbish/golibs/bait"
 
 	rt "github.com/arnodel/golua/runtime"
 	"github.com/arnodel/golua/lib/packagelib"
-	"github.com/chuckpreslar/emission"
 )
 
 type Commander struct{
-	Events *emission.Emitter
+	Events *bait.Bait
 	Loader packagelib.Loader
 }
 
-func New() Commander {
+func New(rtm *rt.Runtime) Commander {
 	c := Commander{
-		Events: emission.NewEmitter(),
+		Events: bait.New(rtm),
 	}
 	c.Loader = packagelib.Loader{
 		Load: c.loaderFunc,
diff --git a/lua.go b/lua.go
index 1ae6752..419970c 100644
--- a/lua.go
+++ b/lua.go
@@ -32,12 +32,17 @@ func luaInit() {
 	lib.LoadLibs(l, fs.Loader)
 	lib.LoadLibs(l, terminal.Loader)
 
-	cmds := commander.New()
+	cmds := commander.New(l)
 	// When a command from Lua is added, register it for use
-	cmds.Events.On("commandRegister", func(cmdName string, cmd *rt.Closure) {
+	cmds.Events.On("commandRegister", func(args ...interface{}) {
+		cmdName := args[0].(string)
+		cmd := args[1].(*rt.Closure)
+
 		commands[cmdName] = cmd
 	})
-	cmds.Events.On("commandDeregister", func(cmdName string) {
+	cmds.Events.On("commandDeregister", func(args ...interface{}) {
+		cmdName := args[0].(string)
+
 		delete(commands, cmdName)
 	})
 	lib.LoadLibs(l, cmds.Loader)
diff --git a/main.go b/main.go
index 119318b..ee0f584 100644
--- a/main.go
+++ b/main.go
@@ -30,7 +30,7 @@ var (
 	userDataDir string
 	curuser *user.User
 
-	hooks bait.Bait
+	hooks *bait.Bait
 	defaultConfPath string
 	defaultHistPath string
 )