diff --git a/pokerth.pro b/pokerth.pro
index 7d9c2a6f..078b5152 100755
--- a/pokerth.pro
+++ b/pokerth.pro
@@ -52,7 +52,8 @@ HEADERS += tinystr.h \
 	   genericsocket.h \
 	   socket_helper.h \
 	   socket_msg.h \
-	   socket_startup.h
+	   socket_startup.h \
+	   thread.h
 SOURCES += pokerth.cpp \
            tinystr.cpp \
            tinyxml.cpp \
@@ -94,15 +95,17 @@ SOURCES += pokerth.cpp \
 	   socket_startup.cpp \
 	   clientstate.cpp \
 	   clientthread.cpp \
-	   socket_helper_cmn.cpp
+	   socket_helper_cmn.cpp \
+	   thread.cpp
 TEMPLATE = vcapp
 RESOURCES = src/gui/qt/deck.qrc
 TEMPLATE = app
-DEPENDPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/net/linux/ 
-INCLUDEPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/net/linux/ 
+DEPENDPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/net/linux/ src/core/
+INCLUDEPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/net/linux/ src/core/
 CONFIG += qt release
 UI_DIR = uics
 TARGET = bin/pokerth
 MOC_DIR = mocs
 OBJECTS_DIR = obj
 QT += 
+LIBS += -lboost_thread-mt
diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp
index 20d5fde9..02eee0e2 100644
--- a/src/gui/qt/guiwrapper.cpp
+++ b/src/gui/qt/guiwrapper.cpp
@@ -28,7 +28,7 @@ GuiWrapper::GuiWrapper() : myLog(0), myW(0)
 {
 
 
-	myW = new mainWindowImpl;
+	myW = new mainWindowImpl(this);
 	myW->show();
 
 	myLog = new Log(myW);
diff --git a/src/gui/qt/joinnetworkgamedialog.ui b/src/gui/qt/joinnetworkgamedialog.ui
index 6b9ab7e2..349967d3 100644
--- a/src/gui/qt/joinnetworkgamedialog.ui
+++ b/src/gui/qt/joinnetworkgamedialog.ui
@@ -95,7 +95,7 @@
        </widget>
       </item>
       <item row="3" column="0" colspan="5" >
-       <widget class="QPushButton" name="pushButton_3" >
+       <widget class="QPushButton" name="pushButton_connect" >
         <property name="text" >
          <string>Connect</string>
         </property>
@@ -118,10 +118,10 @@
        </spacer>
       </item>
       <item row="0" column="1" >
-       <widget class="QLineEdit" name="lineEdit" />
+       <widget class="QLineEdit" name="lineEdit_ipAddress" />
       </item>
       <item row="0" column="4" >
-       <widget class="QLineEdit" name="lineEdit_2" />
+       <widget class="QLineEdit" name="lineEdit_password" />
       </item>
       <item row="0" column="3" >
        <widget class="QLabel" name="label_3" >
@@ -131,7 +131,7 @@
        </widget>
       </item>
       <item row="1" column="4" >
-       <widget class="QSpinBox" name="spinBox" />
+       <widget class="QSpinBox" name="spinBox_port" />
       </item>
       <item row="1" column="3" >
        <widget class="QLabel" name="label_2" >
@@ -162,7 +162,7 @@
        </widget>
       </item>
       <item row="2" column="0" colspan="5" >
-       <widget class="QCheckBox" name="checkBox" >
+       <widget class="QCheckBox" name="checkBox_ipv6" >
         <property name="text" >
          <string>Use IPv6</string>
         </property>
@@ -193,7 +193,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton" >
+      <widget class="QPushButton" name="pushButton_close" >
        <property name="text" >
         <string>Close</string>
        </property>
@@ -206,34 +206,34 @@
  <resources/>
  <connections>
   <connection>
-   <sender>pushButton_3</sender>
+   <sender>pushButton_connect</sender>
+   <signal>clicked()</signal>
+   <receiver>joinNetworkGameDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>79</x>
+     <y>145</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>33</x>
+     <y>422</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pushButton_close</sender>
    <signal>clicked()</signal>
    <receiver>joinNetworkGameDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>124</x>
-     <y>141</y>
+     <x>548</x>
+     <y>429</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>49</x>
-     <y>433</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>pushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>joinNetworkGameDialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>513</x>
-     <y>431</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>449</x>
-     <y>431</y>
+     <x>483</x>
+     <y>428</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
index 121df928..f8cb23cd 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
@@ -26,7 +26,15 @@ joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent)
 
     setupUi(this);
 
+	connect( pushButton_connect, SIGNAL( clicked() ), this, SLOT( startClient() ) );
 	
-
 }
 
+
+void joinNetworkGameDialogImpl::startClient() {
+
+	ClientThread *myClientThread = new ClientThread();
+	myClientThread->Init(lineEdit_ipAddress->text().toStdString(), spinBox_port->value(), checkBox_ipv6->isChecked(), lineEdit_password->text().toStdString());
+	myClientThread->Run();
+
+}
\ No newline at end of file
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
index 6df96e8f..03c593f1 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
@@ -22,6 +22,8 @@
 
 #include "ui_joinnetworkgamedialog.h"
 
+#include "clientthread.h"
+
 #include <iostream>
 #include <QtGui>
 #include <QtCore>
@@ -34,6 +36,7 @@ public:
 
 public slots:
 
+	void startClient();
 };
 
 #endif
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index ef9cf626..98d92267 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -547,7 +547,7 @@ void mainWindowImpl::callJoinNetworkGameDialog() {
 	joinNetworkGameDialogImpl *v = new joinNetworkGameDialogImpl();
 	v->exec();
 
-	if (v->result() == QDialog::Rejected ) {
+	if (v->result() == QDialog::Accepted ) {
 
 		//Dialog mit Statusbalken
 		connectToServerDialogImpl *w = new connectToServerDialogImpl();