diff --git a/index.js b/index.js
index 61dfc939..42f86453 100644
--- a/index.js
+++ b/index.js
@@ -51,8 +51,8 @@ app.on('ready', () => {
         console.info('[Cider] Running in development mode.')
         require('vue-devtools').install()
     }
-    const {Start} = require('./src/main/cider-base')
-    Start()
+
+    CiderBase.Start()
 });
 
 app.on('before-quit', () => {
diff --git a/src/main/base/win.js b/src/main/base/win.js
index 44d3fa6f..945e0e33 100644
--- a/src/main/base/win.js
+++ b/src/main/base/win.js
@@ -10,7 +10,7 @@ module.exports = {
 
     browserWindow: {},
 
-    clientPort: await getPort({port: 9000}),
+    clientPort: 0,
 
     EnvironmentVariables: {
         "env": {
@@ -25,9 +25,11 @@ module.exports = {
 
     /**
      * Creates the BrowserWindow for the application.
-     * @return {object} Window
+     * @return {object} BrowserWindow
      */
-    createBrowserWindow() {
+    async createBrowserWindow() {
+        this.clientPort = await getPort({port: 9000});
+
         const windowStateKeeper = require("electron-window-state"),
             BrowserWindow = require((process.platform === "win32") ? "electron-acrylic-window" : "electron").BrowserWindow;
 
diff --git a/src/main/cider-base.js b/src/main/cider-base.js
index abb14e59..db0a7074 100644
--- a/src/main/cider-base.js
+++ b/src/main/cider-base.js
@@ -1,14 +1,5 @@
-const {BrowserWindow, ipcMain, shell, app, screen} = require("electron")
-const {join} = require("path")
-const getPort = require("get-port");
-const express = require("express");
-const path = require("path");
-const windowStateKeeper = require("electron-window-state");
-const os = require('os');
-const yt = require('youtube-search-without-api-key');
-const discord = require('./plugins/discordrpc');
 const lastfm = require('./plugins/lastfm');
-const mpris = require('./plugins/mpris');
+const win = require('./base/win')
 
 // Analytics for debugging.
 const ElectronSentry = require("@sentry/electron");
@@ -24,8 +15,7 @@ module.exports = {
     * Starts the application (called on on-ready). - Starts BrowserWindow and WebServer
     */
     Start() {
-        const {createBrowserWindow} = require("./base/win");
-        app.win = createBrowserWindow()
+        app.win = win.createBrowserWindow()
     },
 
     /**