diff --git a/client/Makefile b/client/Makefile
index f3a0257a..2826c9d3 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -3,7 +3,7 @@ CC      = /usr/bin/g++
 CFLAGS  = -std=gnu++0x -Wall -Wno-unused-function -g -D_REENTRANT -DVERSION=\"$(VERSION)\" -I..
 LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc
 
-OBJ = snapClient.o stream.o player.o serverConnection.o oggDecoder.o pcmDecoder.o ../common/pcmChunk.o ../common/log.o ../common/sampleFormat.o
+OBJ = snapClient.o stream.o player.o serverConnection.o oggDecoder.o pcmDecoder.o controller.o ../common/pcmChunk.o ../common/log.o ../common/sampleFormat.o
 BIN = snapclient
 
 all:	client
diff --git a/client/serverConnection.cpp b/client/serverConnection.cpp
index dec89494..1a621f2e 100644
--- a/client/serverConnection.cpp
+++ b/client/serverConnection.cpp
@@ -27,13 +27,17 @@ void ServerConnection::socketRead(tcp::socket* socket, void* to, size_t bytes)
 }
 
 
-void ServerConnection::start(MessageReceiver* receiver, const std::string& ip, int port)
+void ServerConnection::start(MessageReceiver* receiver, const std::string& ip, size_t port)
 {
 	messageReceiver = receiver;
-	tcp::resolver resolver(io_service);
+	endpt.address(boost::asio::ip::address::from_string(ip));
+	endpt.port((port));
+    std::cout << "Endpoint IP:   " << endpt.address().to_string() << std::endl;
+    std::cout << "Endpoint Port: " << endpt.port() << std::endl;
+/*	tcp::resolver resolver(io_service);
 	tcp::resolver::query query(tcp::v4(), ip, boost::lexical_cast<string>(port));
 	iterator = resolver.resolve(query);
-	receiverThread = new thread(&ServerConnection::worker, this);
+*/	receiverThread = new thread(&ServerConnection::worker, this);
 }
 
 
@@ -99,7 +103,7 @@ void ServerConnection::worker()
 		try
 		{
 			tcp::socket s(io_service);
-			s.connect(*iterator);
+			s.connect(endpt);//address, port);//*iterator);
 			struct timeval tv;
 			tv.tv_sec  = 5; 
 			tv.tv_usec = 0;         
diff --git a/client/serverConnection.h b/client/serverConnection.h
index 3df85a13..1f50bd0e 100644
--- a/client/serverConnection.h
+++ b/client/serverConnection.h
@@ -24,15 +24,17 @@ class ServerConnection : public MessageReceiver
 {
 public:
 	ServerConnection(Stream* stream);
-	void start(MessageReceiver* receiver, const std::string& ip, int port);
+	void start(MessageReceiver* receiver, const std::string& ip, size_t port);
 	void stop();
 	virtual void onMessageReceived(BaseMessage* message);
 
 private:
-	MessageReceiver* messageReceiver;
-	BaseMessage* getNextMessage(tcp::socket* socket);
 	void socketRead(tcp::socket* socket, void* to, size_t bytes);
 	void worker();
+
+	boost::asio::ip::tcp::endpoint endpt;
+	MessageReceiver* messageReceiver;
+	BaseMessage* getNextMessage(tcp::socket* socket);
 	boost::asio::io_service io_service;
 	tcp::resolver::iterator iterator;
 	std::atomic<bool> active_;
diff --git a/client/snapClient.cpp b/client/snapClient.cpp
index 732b01f0..869bb7d4 100644
--- a/client/snapClient.cpp
+++ b/client/snapClient.cpp
@@ -15,6 +15,7 @@
 #include "stream.h"
 #include "player.h"
 #include "serverConnection.h"
+#include "controller.h"
 
 
 
@@ -69,7 +70,7 @@ int main (int argc, char *argv[])
 	serverConnection.start(&serverConnection, ip, port);
 
 	while(true)
-		usleep(1000);
+		usleep(10000);
 	
     return 0;
 }