diff --git a/structure/extensions/Guild.js b/structure/extensions/Guild.js
index 13b0d34..d5e777d 100644
--- a/structure/extensions/Guild.js
+++ b/structure/extensions/Guild.js
@@ -15,158 +15,24 @@ const Guild = Structures.extend('Guild', (Guild) => {
 
         async settings() {
 
-            if (!this._settings) this._settings = this.client.transactionHandler._send({ provider: 'mongodb', request: { type: 'findOne', query: { guild: this.id } } });
-            if (this._settings instanceof Promise) this._settings = await this._settings;
+            if (!this._settings) this._settings = this.client.transactionHandler._send({ provider: 'mongodb', request: { collection: 'guild_settings', type: 'findOne', query: { guild: this.id } } });
+            if (this._settings instanceof Promise) this._settings = await this._settings || { };
             return this._settings;
 
         }
 
         format(key, parameters = {}) {
-            const language = "en_us"; //this._settings.language or something idk
+
+            const language = this._settings.locale || "en_us"; //this._settings.language or something idk
 
             let value = this.client.localeLoader.languages[language][key];
             for(const [param, val] of Object.entries(parameters)) {
                 value = value.replace(new RegExp(`{${escapeRegex(param.toLowerCase())}}`, 'gi'), val);
             }
             return value;
+            
         }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
         async resolveMembers(members, strict = false) {
 
             return await this.client.resolver.resolveMembers(members, this, strict);