diff --git a/src/client/play.js b/src/client/play.js
new file mode 100644
index 0000000..ebc491e
--- /dev/null
+++ b/src/client/play.js
@@ -0,0 +1,11 @@
+var states = require("../states");
+
+module.exports = function(client, options) {
+  client.once('success', onLogin);
+
+  function onLogin(packet) {
+    client.state = states.PLAY;
+    client.uuid = packet.uuid;
+    client.username = packet.username;
+  }
+};
diff --git a/src/createClient.js b/src/createClient.js
index 97b6bc4..e73bce8 100644
--- a/src/createClient.js
+++ b/src/createClient.js
@@ -3,7 +3,6 @@ var net = require('net');
 var dns = require('dns');
 var Client = require('./client');
 var assert = require('assert');
-var states = require("./states");
 var debug = require("./debug");
 
 var encrypt = require('./client/encrypt');
@@ -11,6 +10,7 @@ var keepalive = require('./client/keepalive');
 var compress = require('./client/compress');
 var caseCorrect = require('./client/caseCorrect');
 var setProtocol = require('./client/setProtocol');
+var play = require('./client/play');
 
 module.exports=createClient;
 
@@ -42,20 +42,14 @@ function createClient(options) {
   options.majorVersion = version.majorVersion;
   options.protocolVersion = version.version;
 
-
   var client = new Client(false, options.majorVersion);
+
   setProtocol(client, options);
   keepalive(client, options);
   encrypt(client);
-  client.once('success', onLogin);
+  play(client);
   compress(client);
   caseCorrect(client, options);
 
   return client;
-
-  function onLogin(packet) {
-    client.state = states.PLAY;
-    client.uuid = packet.uuid;
-    client.username = packet.username;
-  }
 }