diff --git a/Client/controllers/audioController.js b/Client/controllers/audioController.js
index 1fd394b..34b6322 100644
--- a/Client/controllers/audioController.js
+++ b/Client/controllers/audioController.js
@@ -67,7 +67,7 @@ async function createAudioInstance() {
             sampleFormat: portAudio.SampleFormat16Bit,		        
             sampleRate: 48000,		        
             deviceId: selectedDevice.id, // Use -1 or omit the deviceId to select the default device
-            closeOnError: true, // Close the stream if an audio error is detected, if set false then just log the error
+            closeOnError: false, // Close the stream if an audio error is detected, if set false then just log the error
             framesPerBuffer: 20, //(48000 / 1000) * 20, //(48000 * 16 * 2) / 1000 * 20 // (48000 * (16 / 8) * 2) / 60 / 1000 * 20  //0.025 * 48000 / 2
             highwaterMark: 3840,
         },		
diff --git a/Client/controllers/commandController.js b/Client/controllers/commandController.js
index 66043a9..58fb89a 100644
--- a/Client/controllers/commandController.js
+++ b/Client/controllers/commandController.js
@@ -1,15 +1,19 @@
+require('dotenv').config();
 // Debug
 const { DebugBuilder } = require("../utilities/debugBuilder.js");
 const log = new DebugBuilder("client", "commandController");
 // Modules
-const { joinVoiceChannel, VoiceConnectionStatus, getVoiceConnection } = require("@discordjs/voice");
+const { joinVoiceChannel, VoiceConnectionStatus, getVoiceConnection, createAudioPlayer, createAudioResource, AudioPlayerStatus } = require("@discordjs/voice");
 const { OpusEncoder } = require("@discordjs/opus");
+const { calcRmsSync } = require("../utilities/rmsCalculator.js");
 // Utilities
 const {replyToInteraction} = require("../utilities/messageHandler.js");
 const {createAudioInstance} = require("../controllers/audioController.js");
+const { all } = require('../routes/index.js');
 
 // Declare the encoder
 const encoder = new OpusEncoder(48000, 2);
+const noiseGateOpen = process.env.AUDIO_NOISE_GATE_OPEN ?? 100;
 
 /**
  * Join the specified voice channel
@@ -31,33 +35,74 @@ exports.join = async function join({interaction= undefined, guildID= undefined,
     log.DEBUG("Channel ID: ", channelID)
     log.DEBUG("Guild ID: ", guildID)
 
-    const voiceConnection = await joinVoiceChannel({
+    const vcConnectionObj = {
         channelId: channelID,
         guildId: guildID,
         adapterCreator: guildObj.voiceAdapterCreator,
         selfMute: false,
         selfDeaf: false,
-    });
+    };
 
+    // Join the voice channel
+    const voiceConnection = await joinVoiceChannel(vcConnectionObj);
+
+    // Create the audio stream instance
     const audioInstance = await createAudioInstance();
+    log.VERBOSE("Audio Instance: ", audioInstance);    
 
-    log.VERBOSE("Audio Instance: ", audioInstance);
-
+    // Play audio data when it's received from the stream
     audioInstance.on('data', buffer => {
         buffer = Buffer.from(buffer);
-        log.VERBOSE("Audio buffer: ", buffer);
-        const encodedBuffer = encoder.encode(buffer);
-        // TODO Add a function here to check the volume of either buffer and only play audio to discord when there is audio to be played
-        voiceConnection.playOpusPacket(encodedBuffer);
-    })
+        //log.VERBOSE("Audio buffer: ", buffer);
+        // Check intensity of audio and only play when audio is present (no white noise/static)
+        volume = Math.trunc(calcRmsSync(buffer, buffer.length));
 
-    // Exit the audio handler when the bot disconnects
-    voiceConnection.on(VoiceConnectionStatus.Destroyed, () => {
-        audioInstance.quit();
-    })
+        if (parseInt(volume) > parseInt(noiseGateOpen)) {
+            //log.VERBOSE("Noisegate and buffer volume: ", (parseInt(volume) > parseInt(noiseGateOpen)), noiseGateOpen, volume);
+            const encodedBuffer = encoder.encode(buffer);            
+            voiceConnection.playOpusPacket(encodedBuffer);            
+        }
+    });
 
     audioInstance.start();
 
+    // Handle state changes in the voice connection
+    voiceConnection.on('stateChange', async (oldState, newState) => {
+        //log.VERBOSE("VoiceConnection state Changed from state: ", oldState, "\n\nto state: ", newState);
+        log.DEBUG("VoiceConnection state Changed from: ", oldState.status, "to: ", newState.status);
+
+        // Ready -> Connecting
+        if (oldState.status === VoiceConnectionStatus.Ready && newState.status === VoiceConnectionStatus.Connecting) {            
+            log.DEBUG("Configuring Network");
+            voiceConnection.configureNetworking();
+            return;           
+        }            
+
+        // Ready -> Disconnected
+        if (oldState.status === VoiceConnectionStatus.Ready && newState.status === VoiceConnectionStatus.Disconnected) {            
+            log.DEBUG("Attempting to reconnect the voice connection");
+            voiceConnection = joinVoiceChannel(vcConnectionObj);
+            return;
+        }
+
+        // Ready
+        if (newState.status === VoiceConnectionStatus.Ready){            
+            log.DEBUG("Bot connected to voice channel");
+            return;
+        }
+
+        // Destroyed
+        if (newState.status === VoiceConnectionStatus.Destroyed){            
+            log.DEBUG("Quitting audio instance");
+            audioInstance.quit();
+            return;
+        }
+    });
+
+    voiceConnection.on('error', async (error) => {
+        log.ERROR("Voice Connection Error: ", error);
+    })
+
     if (guildID && callback) return callback();
     else return;
 }
diff --git a/Client/utilities/rmsCalculator.js b/Client/utilities/rmsCalculator.js
new file mode 100644
index 0000000..98ad028
--- /dev/null
+++ b/Client/utilities/rmsCalculator.js
@@ -0,0 +1,21 @@
+exports.calcRmsSync = (arr , n) => {
+    var square = 0;
+    var mean = 0;
+    var root = 0;
+
+    // Calculate square.
+    for (i = 0; i < n; i++) {
+        square += Math.pow(arr[i], 2);
+    }
+
+    // Calculate Mean.
+    mean = (square /  (n));
+
+    // Calculate Root.
+    root =  Math.sqrt(mean);
+
+    // Normalize the output
+    root = root / 10
+
+    return root;
+}
\ No newline at end of file