diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2159e60..ff85a2c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_executable(pengobot
     main.cpp
 )
-target_link_libraries(pengobot)
+target_link_libraries(pengobot -static)
diff --git a/src/client.h b/src/client.h
index 9308222..e815df5 100644
--- a/src/client.h
+++ b/src/client.h
@@ -50,10 +50,10 @@ uint16_t spin = 0;
 std::map<char, char*> properties;
 std::map<char, Drone> objects;
 
-int deinit(int response);
+static char* toLower(char* str);
+static std::string toLower(std::string str);
 static char* trim(char *str);
-char* zero(int size);
-unsigned char* uzero(int size);
+int deinit(int response);
 void autoInit();
 void roomInit();
 void roomKeepAlive();
@@ -61,14 +61,18 @@ void autoRandMessage();
 void reciever(int *sock, uint16_t port);
 void sessInit(int *sock, std::string username, std::string password);
 void sessExit(int *sock);
+void constructPropertyList(int type, std::map<int, char*> props, unsigned char* snd);
 void readPropertyList(unsigned char* in);
 std::map<char, char*> readOldPropertyList(unsigned char* in);
-void setAvatar(int *sock, std::string avatar);
+void setAvatar(int *sock, std::string avstr);
 void roomIDReq(int *sock, std::string room);
 void teleport(int *sock, int x, int y, int z, int rot);
-char* dimAdd(std::string room);
+void userEnter(char id);
+void userExit(char id);
 bool strcontains(std::string needle, std::string haystack);
 bool vstrcontains(std::string needle, std::vector<std::string> haystack);
+std::string getContainedWorld(std::map<std::string, std::string> worldlist, std::string input);
+char* handleCommand(std::string from, std::string message);
 void processText(int *sock, std::string username, std::string message);
 void processWhisper(int *sock, std::string username, std::string message);
 void sendChatMessage(int *sock, std::string msg);