diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
index ad0d33c3..8c189336 100644
--- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
+++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
@@ -39,6 +39,11 @@ public class Bootstrap
             return;
         }
 
+        System.out.println( "This version is not ready for production use, please download #788 or below" );
+        if (true){
+            return;
+        }
+        
         if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 51.0 )
         {
             System.err.println( "*** ERROR *** BungeeCord requires Java 7 or above to function!" );
diff --git a/pom.xml b/pom.xml
index 4af63711..f83cf813 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,8 +102,8 @@
                 <artifactId>gitdescribe-maven-plugin</artifactId>
                 <version>1.3</version>
                 <configuration>
-                    <outputPrefix>git-${project.name}-${project.version}-</outputPrefix>
-                    <outputPostfix>-${build.number}</outputPostfix>
+                    <outputPrefix>git:${project.name}:${project.version}:</outputPrefix>
+                    <outputPostfix>:${build.number}</outputPostfix>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 20cf0ce1..375e97c1 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -124,6 +124,7 @@ public class BungeeCord extends ProxyServer
     public final Gson gson = new Gson();
     @Getter
     private ConnectionThrottle connectionThrottle;
+    private final ModuleManager moduleManager = new ModuleManager();
 
     
     {
@@ -187,6 +188,8 @@ public class BungeeCord extends ProxyServer
     {
         ResourceLeakDetector.setEnabled( false ); // Eats performance
 
+        moduleManager.load( this );
+
         pluginsFolder.mkdir();
         pluginManager.detectPlugins( pluginsFolder );
         config.load();
diff --git a/proxy/src/main/java/net/md_5/bungee/ModuleManager.java b/proxy/src/main/java/net/md_5/bungee/ModuleManager.java
new file mode 100644
index 00000000..ce41097e
--- /dev/null
+++ b/proxy/src/main/java/net/md_5/bungee/ModuleManager.java
@@ -0,0 +1,38 @@
+package net.md_5.bungee;
+
+import java.io.File;
+import java.util.List;
+import net.md_5.bungee.api.ProxyServer;
+
+public class ModuleManager
+{
+
+    private class ModuleSpec
+    {
+    }
+
+    public void load(ProxyServer proxy) throws Exception
+    {
+        String version = proxy.getVersion();
+        version = "git:BungeeCord-Proxy:1.7-SNAPSHOT:\"93cf50b\":1337";
+
+        int lastColon = version.lastIndexOf( ':' );
+        int secondLastColon = version.lastIndexOf( ':', lastColon - 1 );
+        String buildNumber = version.substring( lastColon + 1, version.length() );
+        String gitCommit = version.substring( secondLastColon + 1, lastColon ).replaceAll( "\"", "" );
+
+        File moduleDirectory = new File( "modules" );
+        moduleDirectory.mkdir();
+
+        List<ModuleSpec> modules = null;
+
+        // TODO: Use filename filter here and in PluginManager
+        for ( File file : moduleDirectory.listFiles() )
+        {
+            if ( file.isFile() && file.getName().endsWith( ".jar" ) )
+            {
+
+            }
+        }
+    }
+}