diff --git a/scripts/puckochat/commands.js b/scripts/puckochat/commands.js
index a9bf874..dda87da 100644
--- a/scripts/puckochat/commands.js
+++ b/scripts/puckochat/commands.js
@@ -2,8 +2,7 @@ function test(user) {
     return `hello ${user}`;
 }
 
-export function puckocommand(isGM, user, world, log, message, data) {
-    console.log(`isGM: ${isGM}`);
+export function puckocommand(user, world, log, message, data) {
     console.log(`user: ${user}`);
     console.log(`world: ${world}`);
     console.log(`log: `);
@@ -11,6 +10,6 @@ export function puckocommand(isGM, user, world, log, message, data) {
     console.log(`message: ${message}`);
     console.log(`data: `);
     console.log(data);
-    if(message[0] === "test") return test(user);
+    if(message[0] === "test") return test(user.name);
     return ""
 }
\ No newline at end of file
diff --git a/scripts/puckochat/main.js b/scripts/puckochat/main.js
index 372102c..4969d0e 100644
--- a/scripts/puckochat/main.js
+++ b/scripts/puckochat/main.js
@@ -10,12 +10,10 @@ Hooks.on("ready", async function() {
 
 Hooks.on("chatMessage", (log, message, data) => {
   let to_send = "";
-  let isGM = "";
-  let user = "";
+  let user = game.users.get(data.user);
   let world = game.world.id;
-  console.log("[puckoprutt] chat!");
 
-  if(message[0] === "!") to_send = puckocommand(isGM, user, world, log, message.slice(1).split(" "), data);
+  if(message[0] === "!") to_send = puckocommand(user, world, log, message.slice(1).split(" "), data);
 
   if(to_send !== "") {
     ChatMessage.create({