--- a/client/main.cpp	Tue Apr 25 12:44:18 2017 +0200
+++ b/client/main.cpp	Wed Jun 07 20:44:37 2017 +0200
@@ -16,37 +16,19 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <malikania/duktape.hpp>
-
-#include <chrono>
-#include <thread>
-
-#include <malikania/client/button.hpp>
-#include <malikania/client/color.hpp>
-#include <malikania/client/frame.hpp>
-#include <malikania/client/label.hpp>
-#include <malikania/client/point.hpp>
-#include <malikania/client/unique_layout.hpp>
-#include <malikania/client/window.hpp>
+#include <malikania/client/connection.hpp>
+#include <malikania/client/client.hpp>
 
 int main()
 {
-    mlk::client::window win;
+    boost::asio::io_service service;
 
-    auto f = std::make_shared<mlk::client::frame>();
-    auto w = std::make_shared<mlk::client::label>("Malikania");
-    auto l = std::make_shared<mlk::client::unique_layout>(w);
+    mlk::client::connection cn(service);
+    mlk::client::client client(service, cn);
 
-    f->move({50, 50});
-    f->set_layout(l);
-    win.add_frame(f);
+    client.connect("localhost", 3320);
 
-    while (win.is_open()) {
-        win.poll();
-        win.set_drawing_color({255, 255, 255, 255});
-        win.clear();
-        win.draw_frames();
-        win.present();
-        std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    for (;;) {
+        service.run();
     }
 }