diff --git a/Makefile b/Makefile
index c397699..3504370 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BINARY=renga
 CPP=clang
-FLAGS=-lbe -std=c++20 -lstdc++
+FLAGS=-lbe -lgloox -std=c++20 -lstdc++
 
 all: build
 
diff --git a/src/App.h b/src/App.h
index 462a3a2..b8ec9ae 100644
--- a/src/App.h
+++ b/src/App.h
@@ -8,16 +8,13 @@
 #include <Application.h>
 
 #define kSignature "application/x-vnd.iwakura-Renga"
-
-class Client : public gloox::ConnectionListener, gloox::PresenceHandler {
-
-};
+#define appName "Renga"
+#define appVersion "v0.1"
 
 class App : public BApplication
 {
 	public:
 		App(void);
-		Client *client;
 };
 
 #endif
diff --git a/src/Client.cpp b/src/Client.cpp
deleted file mode 100644
index f2570ff..0000000
--- a/src/Client.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <gloox/connectionlistener.h>
-#include <gloox/presencehandler.h>
-#include "Client.h"
-#include <Application.h>
-
-Client::
-
-#endif
diff --git a/src/Client.h b/src/Client.h
deleted file mode 100644
index 9eb1467..0000000
--- a/src/Client.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef CLIENT_H
-#define CLIENT_H
-
-#include <gloox/connectionlistener.h>
-#include <gloox/presencehandler.h>
-#include <Application.h>
-
-class Client : public gloox::ConnectionListener, gloox::PresenceHandler {
-	public:
-		void connect(void);
-
-};
-
-#endif
diff --git a/src/gui/Contacts.cpp b/src/gui/Contacts.cpp
index 4973397..827efc3 100644
--- a/src/gui/Contacts.cpp
+++ b/src/gui/Contacts.cpp
@@ -6,7 +6,7 @@
 #include <Window.h>
 #include <StringView.h>
 
-Contacts::Contacts(void) 
+Contacts::Contacts() 
 	: 	BWindow(BRect(200,200,600,400), TITLE, B_TITLED_WINDOW, B_NOT_MINIMIZABLE | B_QUIT_ON_WINDOW_CLOSE)
 {
 	BGroupLayout *group = new BGroupLayout(B_VERTICAL);
diff --git a/src/gui/Contacts.h b/src/gui/Contacts.h
index 21ac43d..3614782 100644
--- a/src/gui/Contacts.h
+++ b/src/gui/Contacts.h
@@ -7,6 +7,7 @@
 class Contacts : public BWindow {
 	public:
 		Contacts(void);
+		void onMessage(const char* jid, const char* msg);
 };
 
 #endif
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 7df9fa5..3d6b3ad 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -75,6 +75,7 @@ void MainWindow::MessageReceived(BMessage *msg)
 				printf("Connect button clicked...\n");
 
 				Hide();
+
 				Middleman *middleman = new Middleman(JidInputBox->Text(), PwInputBox->Text(), Application);
 				middleman->Show();
 
diff --git a/src/gui/Middleman.cpp b/src/gui/Middleman.cpp
index 5eaf3a7..fd1029e 100644
--- a/src/gui/Middleman.cpp
+++ b/src/gui/Middleman.cpp
@@ -18,6 +18,6 @@ Middleman::Middleman(const char* jid, const char* password, App *app)
 
 	group->View()->AdoptSystemColors();
 
-	group->AddView(new BStringView("label", "Placeholder label (connection middleman to be added)"));
+	group->AddView(new BStringView("label", "Placeholder label (connecting...)"));
 	group->AddView(new BStringView("label", std::format("JID: {}\nPassword: {}", jid, password).c_str()));
 }
diff --git a/src/gui/Middleman.h b/src/gui/Middleman.h
index d220a65..c4d11ac 100644
--- a/src/gui/Middleman.h
+++ b/src/gui/Middleman.h
@@ -5,6 +5,9 @@
 #include "../App.h"
 #define TITLE "Connecting..."
 
+// Middleman is the "middle" window that sets up the XMPP connection and manages all windows that require one.
+// TODO: add client class to mm class for windows to send message
+
 class Middleman : public BWindow {
 	public:
 		Middleman(const char* jid, const char* password, App *app);