diff --git a/Dorkbox-Util/.classpath b/Dorkbox-Util/.classpath
index cd4aae4..e8a6f1e 100644
--- a/Dorkbox-Util/.classpath
+++ b/Dorkbox-Util/.classpath
@@ -10,7 +10,6 @@
 	<classpathentry kind="lib" path="/Dependencies/javassist/javassist.jar"/>
 	<classpathentry kind="lib" path="/Dependencies/BouncyCastleCrypto/bcpkix-jdk15on-151.jar" sourcepath="/Dependencies/BouncyCastleCrypto/bcpkix-jdk15on-151-src.zip"/>
 	<classpathentry kind="lib" path="/Dependencies/BouncyCastleCrypto/bcprov-debug-jdk15on-151.jar" sourcepath="/Dependencies/BouncyCastleCrypto/bcprov-jdk15on-151-src.zip"/>
-	<classpathentry kind="lib" path="/Dependencies/asm/asm-5.0.3.jar" sourcepath="/Dependencies/asm/asm-5.0.3-src.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JavaLauncher-Util"/>
 	<classpathentry kind="lib" path="/Dependencies/jodaTime/joda-time-2.4.jar" sourcepath="/Dependencies/jodaTime/joda-time-2.4-sources.zip"/>
@@ -25,12 +24,8 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="/Dependencies/dorkbox/object_pool/ObjectPool_v1.1.jar" sourcepath="/Dependencies/dorkbox/object_pool/ObjectPool_v1.1_src.zip"/>
-	<classpathentry kind="lib" path="/Dependencies/dorkbox/multimbassador/MultiMBassador_v1.1.jar" sourcepath="/Dependencies/dorkbox/multimbassador/MultiMBassador_v1.1_src.zip"/>
-	<classpathentry kind="lib" path="/Dependencies/concurrent-locks/concurrent-locks-1.0.0.jar" sourcepath="/Dependencies/concurrent-locks/concurrent-locks-1.0.0-sources.zip"/>
-	<classpathentry kind="lib" path="/Dependencies/disruptor/disruptor-3.3.0.jar" sourcepath="/Dependencies/disruptor/disruptor-3.3.0-sources.zip">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/Dependencies/disruptor/disruptor-3.3.0-javadoc.zip!/"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="lib" path="/Dependencies/asm/asm-5.0.4.jar"/>
+	<classpathentry kind="lib" path="/Dependencies/dorkbox/message_bus/MessageBus_v1.0.jar" sourcepath="/Dependencies/dorkbox/message_bus/MessageBus_v1.0_src.zip"/>
+	<classpathentry kind="lib" path="/Dependencies/JCTools/JCTools-v1.1-alpha-MTAQ.jar" sourcepath="/Dependencies/JCTools/JCTools-1.1-alpha-MTAQ-src.zip"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/Dorkbox-Util/Dorkbox-Util.iml b/Dorkbox-Util/Dorkbox-Util.iml
index e4e6f03..d853296 100644
--- a/Dorkbox-Util/Dorkbox-Util.iml
+++ b/Dorkbox-Util/Dorkbox-Util.iml
@@ -17,42 +17,54 @@
     <libelement value="file:///Dependencies/jodaTime/joda-time-2.4.jar" />
     <libelement value="file:///Dependencies/jna/jna-4.1.0.jar" />
     <libelement value="file:///Dependencies/jansi/jansi-1.11b.jar" />
+    <libelement value="file:///Dependencies/lzma-java/lzma-java-1.1.jar" />
+    <libelement value="file:///Dependencies/kryo/objenesis-2.1.jar" />
+    <libelement value="file:///Dependencies/kryo/kryo3-debug.jar" />
+    <libelement value="file:///Dependencies/dorkbox/object_pool/ObjectPool_v1.1.jar" />
+    <libelement value="file:///Dependencies/dorkbox/multimbassador/MultiMBassador_v1.1.jar" />
+    <libelement value="file:///Dependencies/concurrent-locks/concurrent-locks-1.0.0.jar" />
+    <libelement value="file:///Dependencies/disruptor/disruptor-3.3.0.jar" />
     <src_description expected_position="0">
       <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
       <src_folder value="file://$MODULE_DIR$/test" expected_position="1" />
     </src_description>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/classes" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="JavaLauncher-Util" />
+    <orderEntry type="library" name="dorkbox object_pool" level="application" />
+    <orderEntry type="library" name="dorkbx message_bus" level="application" />
+    <orderEntry type="library" name="logging slf4j-api (1.7.5)" level="application" />
+    <orderEntry type="library" name="lzma-java" level="application" />
+    <orderEntry type="library" name="bouncyCastle bcpkix-jdk15on (1.51)" level="application" />
+    <orderEntry type="library" name="bouncyCastle bcprov-jdk15on (1.51)" level="application" />
+    <orderEntry type="library" name="reflectasm" level="application" />
+    <orderEntry type="library" name="asm (5.0.4)" level="application" />
+    <orderEntry type="library" name="jna (4.1.0)" level="application" />
+    <orderEntry type="library" name="joda-time (2.4)" level="application" />
+    <orderEntry type="library" name="javassist" level="application" />
+    <orderEntry type="library" name="objenesis (2.1)" level="application" />
+    <orderEntry type="library" name="kryo3" level="application" />
+    <orderEntry type="library" name="jansi (1.11b)" level="application" />
+    <orderEntry type="library" name="netty-all (4.1.0)" level="application" />
     <orderEntry type="module-library">
-      <library name="junit4">
+      <library name="JUnit4">
         <CLASSES>
           <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="jdk" jdkName="JavaSE-1.7" jdkType="JavaSDK" />
-    <orderEntry type="module" module-name="JavaLauncher-Util" />
-    <orderEntry type="library" name="bcpkix-jdk15on" level="project" />
-    <orderEntry type="library" name="bcprov-jdk15on" level="project" />
-    <orderEntry type="library" name="slf4j" level="project" />
-    <orderEntry type="library" name="netty-all" level="project" />
-    <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="library" name="jansi" level="project" />
-    <orderEntry type="library" name="javassist" level="project" />
-    <orderEntry type="library" name="kryo" level="project" />
-    <orderEntry type="library" name="lzma-java" level="project" />
-    <orderEntry type="library" name="minlog-to-slf4j" level="project" />
-    <orderEntry type="library" name="joda-time" level="project" />
-    <orderEntry type="library" name="jna" level="project" />
+    <orderEntry type="library" name="JCTools (1.1 alpha MTAQ)" level="application" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">