diff --git a/registerCommands.js b/registerCommands.js
index 0829fae..c351d55 100644
--- a/registerCommands.js
+++ b/registerCommands.js
@@ -5,109 +5,134 @@ const {Client, Constants} = require('discord.js');
  * @param {Client} bot 
  */
 function registerCommands(bot) {
-    const commands = bot.application.commands;
+    return new Promise((resolve, reject) => {
+        const commands = bot.application.commands;
 
-    /*
-        val: {
-            name: 'code',
-            description: "See where Selmer bot's code is stored! (you can also use _!repo_)",
-            execute: [Function: execute]
-        },
+        /*
+            val: {
+                name: 'code',
+                description: "See where Selmer bot's code is stored! (you can also use _!repo_)",
+                execute: [Function: execute]
+            },
 
-        key: code
-    */
-    bot.commands.forEach((val, key) => {
-        if ((val.options && val.name != 'econ') || val.isDm) {
-            if (val.isDm) {
-                commands.create({
-                    name: val.name,
-                    description: val.description,
-                    options: val.options,
-                    dm_permission: true,
-                });
+            key: code
+        */
+
+        //#region Slash Commands
+        bot.commands.forEach((val, key) => {
+            if ((val.options && val.name != 'econ') || val.isDm) {
+                if (val.isDm) {
+                    commands.create({
+                        name: val.name,
+                        description: val.description,
+                        options: val.options,
+                        dm_permission: true,
+                    });
+                } else {
+                    commands.create({
+                        name: val.name,
+                        description: val.description,
+                        options: val.options,
+                        dm_permission: false,
+                    });
+                }
             } else {
-                commands.create({
-                    name: val.name,
-                    description: val.description,
-                    options: val.options,
-                    dm_permission: false,
-                });
+                // console.log(val, key);
+                console.log(key);
             }
-        } else {
-            // console.log(val, key);
-            console.log(key);
+        });
+
+        //Create the "econ" commands
+        const econList = ["buy", 'shop', 'work', 'rank', 'inventory', 'balance', 'sell'];
+        const econMain = require('./commands/db/econSlashOptions.js');
+
+        econList.forEach((commandName) => {
+            const command = econMain[`${commandName}`];
+            commands.create({
+                name: commandName,
+                description: command.description,
+                options: command.options || [],
+                dm_permission: false,
+            });
+        });
+
+
+        //Create the moderation commands
+        //NOTE: The user needs to have kicking or banning permissions to use these
+        const modList = ['lock', 'unlock', 'kick', 'ban', 'unban', 'mute', 'unmute'];
+        for (let i = 0; i < modList.length; i++) {
+            const opts = [
+                {name: "user", description: `The user to ${modList[i]}`, type: Constants.ApplicationCommandOptionTypes.USER, required: true},
+                {name: "reason", description: "Why?", type: Constants.ApplicationCommandOptionTypes.STRING, required: false}
+            ];
+
+            commands.create({
+                name: modList[i],
+                description: `${modList[i]} a user`,
+                options: opts,
+                dm_permission: false,
+                default_member_permissions: 6,
+            });
+            
+            // .then((comm) => {
+            //     comm.setDefaultMemberPermissions(Discord.PermissionFlagsBits.KickMembers | Discord.PermissionFlagsBits.BanMembers);
+            // });
         }
-    });
 
-    //Create the "econ" commands
-    const econList = ["buy", 'shop', 'work', 'rank', 'inventory', 'balance', 'sell'];
-    const econMain = require('./commands/db/econSlashOptions.js');
-
-    econList.forEach((commandName) => {
-        const command = econMain[`${commandName}`];
-        commands.create({
-            name: commandName,
-            description: command.description,
-            options: command.options || [],
-            dm_permission: false,
+        //Admin commands (Home Server only)
+        const guild = bot.guilds.cache.get(bot.home_server);
+        guild.commands.create({
+            name: "admin",
+            description: "admin commands",
+            // type: Constants.ApplicationCommandOptionTypes.SUB_COMMAND_GROUP,
+            options: [
+                {
+                    name: "setpresence",
+                    description: "Change the bot's presence",
+                    type: Constants.ApplicationCommandOptionTypes.SUB_COMMAND,
+                    options: [
+                        {name: "pres_text", description: "The new presence text", type: Constants.ApplicationCommandOptionTypes.STRING, required: true },
+                        {name: "type", description: "The new presence text", type: Constants.ApplicationCommandOptionTypes.STRING, required: true, choices: [
+                            {name: "LISTENING", value: "LISTENING"}, {name: "WATCHING", value: "WATCHING"}, {name: "COMPETING", value: "COMPETING"}, {name: "PLAYING", value: "PLAYING"}, { name: "STREAMING", value: "STREAMING"}
+                        ]},
+                        {name: 'display_name', description: "What to display instead of the stream's title", type: Constants.ApplicationCommandOptionTypes.STRING, required: false}
+                    ],
+                    dm_permission: false
+                },
+                {
+                    name: "setactivity",
+                    description: "Change the bot's activity",
+                    type: Constants.ApplicationCommandOptionTypes.SUB_COMMAND,
+                    options: [
+                        {name: "type", description: "The new presence text", type: Constants.ApplicationCommandOptionTypes.STRING, required: true, choices: [
+                            {name: "Do Not Disturb", value: "dnd"}, {name: "Idle", value: "idle"}, {name: "invisible", value: "invisible"}, {name: "online", value: "online"}
+                        ]},
+                    ],
+                    dm_permission: false
+                },
+            ]
         });
-    });
-
-
-    //Create the moderation commands
-    //NOTE: The user needs to have kicking or banning permissions to use these
-    const modList = ['lock', 'unlock', 'kick', 'ban', 'unban', 'mute', 'unmute'];
-    for (let i = 0; i < modList.length; i++) {
-        const opts = [
-            {name: "user", description: `The user to ${modList[i]}`, type: Constants.ApplicationCommandOptionTypes.USER, required: true},
-            {name: "reason", description: "Why?", type: Constants.ApplicationCommandOptionTypes.STRING, required: false}
-        ];
-
+return resolve(true);
+        //Takes much longer, so it'll be the benchmark for when the Promise resolves
+        //#region GAMES
+        const gameOpts = require('./commands/games/gameCommandOptions.js');
         commands.create({
-            name: modList[i],
-            description: `${modList[i]} a user`,
-            options: opts,
-            dm_permission: false,
-            default_member_permissions: 6,
-        });
+            name: 'game',
+            description: 'Play one of Selmer Bot\'s games!', //NOT APPLICABLE USING SUB COMMAND GROUPS???
+            // type: Constants.ApplicationCommandOptionTypes.SUB_COMMAND_GROUP,
+            options: gameOpts
+        }).then(() => { resolve(true); }).catch((err) => { reject(err); });
+        //#endregion
+
         
-        // .then((comm) => {
-        //     comm.setDefaultMemberPermissions(Discord.PermissionFlagsBits.KickMembers | Discord.PermissionFlagsBits.BanMembers);
-        // });
-    }
+        //#endregion
 
-    //Admin commands (Home Server only)
-    const guild = bot.guilds.cache.get(bot.home_server);
-    guild.commands.create({
-        name: "admin",
-        description: "admin commands",
-        // type: Constants.ApplicationCommandOptionTypes.SUB_COMMAND_GROUP,
-        options: [
-            {
-                name: "setpresence",
-                description: "Change the bot's presence",
-                type: Constants.ApplicationCommandOptionTypes.SUB_COMMAND,
-                options: [
-                    {name: "pres_text", description: "The new presence text", type: Constants.ApplicationCommandOptionTypes.STRING, required: true },
-                    {name: "type", description: "The new presence text", type: Constants.ApplicationCommandOptionTypes.STRING, required: true, choices: [
-                        {name: "LISTENING", value: "LISTENING"}, {name: "WATCHING", value: "WATCHING"}, {name: "COMPETING", value: "COMPETING"}, {name: "PLAYING", value: "PLAYING"}, { name: "STREAMING", value: "STREAMING"}
-                    ]},
-                    {name: 'display_name', description: "What to display instead of the stream's title", type: Constants.ApplicationCommandOptionTypes.STRING, required: false}
-                ],
-                dm_permission: false
-            },
-            {
-                name: "setactivity",
-                description: "Change the bot's activity",
-                type: Constants.ApplicationCommandOptionTypes.SUB_COMMAND,
-                options: [
-                    {name: "type", description: "The new presence text", type: Constants.ApplicationCommandOptionTypes.STRING, required: true, choices: [
-                        {name: "Do Not Disturb", value: "dnd"}, {name: "Idle", value: "idle"}, {name: "invisible", value: "invisible"}, {name: "online", value: "online"}
-                    ]},
-                ],
-                dm_permission: false
-            },
-        ]
+        //#region Context Menus
+        commands.create({
+            name: "Temp",
+            type: 'USER'
+        });
+        //#endregion
     });
 }