diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java
index 665874da5..65a8103c5 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java
@@ -40,7 +40,9 @@ import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.levelgen.Heightmap;
 
-import javax.annotation.Nullable;
+// Which nullable should be used???
+import org.jetbrains.annotations.Nullable;
+//import javax.annotation.Nullable;
 
 /**
  *
diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java
index bb3815b41..21793d32a 100644
--- a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java
+++ b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java
@@ -29,9 +29,13 @@ import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
 import com.seibel.lod.core.ModInfo;
 import com.seibel.lod.core.ReflectionHandler;
+import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.lod.core.dependencyInjection.SingletonInjector;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IBCLibAccessor;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.lod.forge.wrappers.ForgeDependencySetup;
 
@@ -84,6 +88,10 @@ public class ForgeMain implements LodForgeMethodCaller
 
 	public ForgeMain()
 	{
+		DependencySetup.createClientBindings();
+
+//		initDedicated(null);
+//		initDedicated(null);
 		// Register the mod initializer (Actual event registration is done in the different proxies)
 		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::initClient);
 		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::initDedicated);
@@ -91,36 +99,18 @@ public class ForgeMain implements LodForgeMethodCaller
 
 	private void initClient(final FMLClientSetupEvent event)
 	{
-		DependencySetup.createClientBindings();
-		initCommon();
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
+
+		LOGGER.info("Initializing Mod");
+		LodCommonMain.startup(this);
+		ForgeDependencySetup.createInitialBindings();
+		LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
 
 		client_proxy = new ForgeClientProxy();
 		MinecraftForge.EVENT_BUS.register(client_proxy);
 		server_proxy = new ForgeServerProxy(false);
 		MinecraftForge.EVENT_BUS.register(server_proxy);
 
-		postInitCommon();
-	}
-
-	private void initDedicated(final FMLDedicatedServerSetupEvent event)
-	{
-		DependencySetup.createServerBindings();
-		initCommon();
-
-		server_proxy = new ForgeServerProxy(true);
-		MinecraftForge.EVENT_BUS.register(server_proxy);
-
-		postInitCommon();
-	}
-
-	private void initCommon()
-	{
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
-		
-		LodCommonMain.startup(this);
-		ForgeDependencySetup.createInitialBindings();
-		LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
-
 		if (ReflectionHandler.INSTANCE.optifinePresent()) {
 			ModAccessorInjector.INSTANCE.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}
@@ -131,16 +121,33 @@ public class ForgeMain implements LodForgeMethodCaller
 		ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class,
 				() -> new ConfigGuiHandler.ConfigGuiFactory((client, parent) -> GetConfigScreen.getScreen(parent)));
 		#endif
+
+		LOGGER.info(ModInfo.READABLE_NAME + " Initialized");
+
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
+
+		// Init config
+		// The reason im initialising in this rather than the post init process is cus im using this for the auto updater
+		LodCommonMain.initConfig();
+	}
+
+	private void initDedicated(final FMLDedicatedServerSetupEvent event)
+	{
+//		DependencySetup.createServerBindings();
+//		initCommon();
+
+//		server_proxy = new ForgeServerProxy(true);
+//		MinecraftForge.EVENT_BUS.register(server_proxy);
+//
+		postInitCommon();
 	}
 
 	private void postInitCommon()
 	{
 		LOGGER.info("Post-Initializing Mod");
-		SingletonInjector.INSTANCE.runDelayedSetup();
-		LodCommonMain.initConfig();
+		ForgeDependencySetup.runDelayedSetup();
+
 		LOGGER.info("Mod Post-Initialized");
-		
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 	}
 
 	private final ModelDataMap dataMap = new ModelDataMap.Builder().build();
diff --git a/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java b/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java
index 3eaacb9fd..7f48d2147 100644
--- a/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java
+++ b/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java
@@ -40,4 +40,7 @@ public class ForgeDependencySetup
 		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
 	}
 
+	public static void runDelayedSetup() {
+		SingletonInjector.INSTANCE.runDelayedSetup();
+	}
 }
diff --git a/forge/src/main/resources/DistantHorizons.mixins.json b/forge/src/main/resources/DistantHorizons.mixins.json
index ea64d31cb..3254ee23b 100644
--- a/forge/src/main/resources/DistantHorizons.mixins.json
+++ b/forge/src/main/resources/DistantHorizons.mixins.json
@@ -3,18 +3,18 @@
 	"minVersion": "0.8",
 	"package": "com.seibel.lod.forge.mixins",
 	"mixins": [
-      "com.seibel.lod.forge.mixins.server.unsafe.MixinThreadingDetector",
-      "com.seibel.lod.forge.mixins.server.MixinUtilBackgroundThread",
-      "com.seibel.lod.forge.mixins.server.MixinChunkGenerator",
+      	"server.unsafe.MixinThreadingDetector",
+      	"server.MixinUtilBackgroundThread",
+      	"server.MixinChunkGenerator",
 		"server.MixinTFChunkGenerator"
 	],
 	"client": [
-      "com.seibel.lod.forge.mixins.client.MixinDebugScreenOverlay",
-      "com.seibel.lod.forge.mixins.client.MixinFogRenderer",
-      "com.seibel.lod.forge.mixins.client.MixinGameRenderer",
-      "com.seibel.lod.forge.mixins.client.MixinLevelRenderer",
-      "com.seibel.lod.forge.mixins.client.MixinLightmap",
-      "com.seibel.lod.forge.mixins.client.MixinOptionsScreen"
+      "client.MixinDebugScreenOverlay",
+      "client.MixinFogRenderer",
+      "client.MixinGameRenderer",
+      "client.MixinLevelRenderer",
+      "client.MixinLightmap",
+      "client.MixinOptionsScreen"
 	],
 	"server": [],
 	"plugin": "com.seibel.lod.forge.mixins.ForgeMixinPlugin"