diff --git a/src/commands/nucleus/premium.ts b/src/commands/nucleus/premium.ts
index 74d7da8..8b47ab7 100644
--- a/src/commands/nucleus/premium.ts
+++ b/src/commands/nucleus/premium.ts
@@ -42,14 +42,20 @@
         count = 3;
     }
 
-    const closed = false;
+    const hasPremium = await client.database.premium.hasPremium(interaction.guild!.id);
+    let premiumGuild = ""
+    if (hasPremium) {
+        premiumGuild = `\n\n**This server has premium!**`
+    }
+
+    let closed = false;
     do {
         interaction.editReply({
             embeds: [
                 new EmojiEmbed()
                     .setTitle("Premium")
                     .setDescription(
-                        premium + firstDescription
+                        premium + firstDescription + premiumGuild
                     )
                     .setEmoji("NUCLEUS.LOGO")
                     .setStatus("Danger")
@@ -61,15 +67,55 @@
                             .setStyle(ButtonStyle.Primary)
                             .setLabel("Activate Premium here")
                             .setCustomId("premiumActivate")
-                            .setDisabled(count <= 0)
+                            .setDisabled(count <= 0 && hasPremium)
                     )
             ]
         });
 
         const filter = (i: any) => i.customId === "premiumActivate" && i.user.id === interaction.user.id;
-        const collector = interaction.channel?.awaitMessageComponent({ filter, time: 60000 });
-        
-    } while (closed);
+        let i;
+        try {
+            i = await interaction.channel!.awaitMessageComponent({ filter, time: 60000 });
+        } catch (e) {
+            return;
+        }
+        if (i) {
+            i.deferUpdate();
+            let guild = i.guild!;
+            let m = await client.database.premium.fetchTotal(interaction.user.id);
+            if (count - m <= 0) {
+                interaction.editReply({
+                    embeds: [
+                        new EmojiEmbed()
+                            .setTitle("Premium")
+                            .setDescription(
+                                `You have already activated premium on the maximum amount of servers!` + firstDescription
+                            )
+                            .setEmoji("NUCLEUS.LOGO")
+                            .setStatus("Danger")
+                    ],
+                    components: []
+                });
+                closed = true;
+            } else {
+                client.database.premium.addPremium(interaction.user.id, guild.id);
+                interaction.editReply({
+                    embeds: [
+                        new EmojiEmbed()
+                            .setTitle("Premium")
+                            .setDescription(
+                                `You have activated premium on this server!` + firstDescription
+                            )
+                            .setEmoji("NUCLEUS.LOGO")
+                            .setStatus("Danger")
+                    ],
+                    components: []
+                });
+                closed = true;
+            }
+        }
+
+    } while (!closed);
 };
 
 const check = () => {
diff --git a/src/commands/settings/oldStats.ts b/src/commands/settings/oldStats.ts
index 94b09a4..8f13109 100644
--- a/src/commands/settings/oldStats.ts
+++ b/src/commands/settings/oldStats.ts
@@ -12,7 +12,7 @@
 
 const command = (builder: SlashCommandSubcommandBuilder) =>
     builder
-        .setName("stats")
+        .setName("oldstats")
         .setDescription("Controls channels which update when someone joins or leaves the server")
 
 type ChangesType = Record<string, { name?: string; enabled?: boolean; }>
