diff --git a/entrypoint.js b/entrypoint.js
new file mode 100644
index 000000000..507cf5cb7
--- /dev/null
+++ b/entrypoint.js
@@ -0,0 +1,29 @@
+/* global process */
+/*
+	this is the entrypoint file, when node finally catches
+	up with all ES6 drafts etc, the entrypoint file will stop
+	using the transpiled ES5 and switch straight to the ES6
+	code. This allows for easier debugging and potentially
+	faster execution!
+*/
+var v = process.version;
+if(v.charAt(0) === "v"){
+	v = v.substring(1);
+}
+
+v = v.split(".");
+
+var major = parseInt(v[0]),
+	minor = parseInt(v[1]),
+	patch = parseInt(v[2]);
+
+// at the moment no node version has full ES6 support	
+use5();
+
+function use6(){
+	module.exports = require("./src/index.js");
+}
+
+function use5(){
+	module.exports = require("./lib/index.js");
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 4c6ebd14f..bbfd04715 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "discord.js",
   "version": "4.1.1",
   "description": "A way to interface with the Discord API",
-  "main": "./lib/index.js",
+  "main": "./entrypoint.js",
   "scripts": {
     "test": "node ./test/bot.js"
   },