diff --git a/.gitignore b/.gitignore
index 91f67b7..bff1709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 .gradle/
 build/
 !src/**/build
-
-/serverData/
-
 /buildSrcTemp/
-
+/serverData/
 generatedKotlin/
diff --git a/.runConfigurations/Clean.run.xml b/.runConfigurations/Clean.run.xml
new file mode 100644
index 0000000..0984f5f
--- /dev/null
+++ b/.runConfigurations/Clean.run.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Clean" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="clean" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.runConfigurations/Generate.run.xml b/.runConfigurations/Generate.run.xml
new file mode 100644
index 0000000..1907bf1
--- /dev/null
+++ b/.runConfigurations/Generate.run.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Generate" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="generate" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.runConfigurations/Run.run.xml b/.runConfigurations/Run.run.xml
new file mode 100644
index 0000000..46d06a7
--- /dev/null
+++ b/.runConfigurations/Run.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run" type="JetRunConfigurationType">
+    <module name="blokk.blokk-server.main" />
+    <option name="VM_PARAMETERS" value="" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="MAIN_CLASS_NAME" value="space.blokk.BlokkServer" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/blokk-server/src/main/kotlin/space/blokk/BlokkServer.kt b/blokk-server/src/main/kotlin/space/blokk/BlokkServer.kt
index 49fb7a9..fce3418 100644
--- a/blokk-server/src/main/kotlin/space/blokk/BlokkServer.kt
+++ b/blokk-server/src/main/kotlin/space/blokk/BlokkServer.kt
@@ -3,7 +3,8 @@ package space.blokk
 import com.sksamuel.hoplite.ConfigFilePropertySource
 import com.sksamuel.hoplite.ConfigLoader
 import com.sksamuel.hoplite.ConfigSource
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.runBlocking
 import space.blokk.config.BlokkConfig
 import space.blokk.event.EventBus
 import space.blokk.event.EventTargetGroup
@@ -93,7 +94,9 @@ class BlokkServer internal constructor() : Server {
     }
 
     override fun shutdown() {
-        scope.launch {
+        scope.cancel("Shutdown")
+
+        runBlocking {
             scheduler.shutdown()
         }
     }