diff --git a/main.cpp b/main.cpp
index dcf0137fd..84406c265 100644
--- a/main.cpp
+++ b/main.cpp
@@ -24,6 +24,10 @@ int main(int argc, char *argv[])
  * Notifications/ringing when a call is received
  * Sort the friend list by status, online first then busy then offline
  * Don't do anything if a friend is disconnected, don't print to the chat
+ * Changing online/away/busy/offline by clicking the bubble
+ * /me action messages
+ * Popup windows for adding friends and changing settings
+ * And logging of the chat
  * Show the picture's size between name and size after transfer completion if it's a pic
  * Adjust all status icons to match the mockup, including scooting the friendslist ones to the left and making the user one the same size
  * Sidepanel (friendlist) should be resizeable
diff --git a/toxgui.pro b/toxgui.pro
index 763898188..fb184c2eb 100644
--- a/toxgui.pro
+++ b/toxgui.pro
@@ -74,45 +74,48 @@ SOURCES += \
     audiobuffer.cpp \
     widget/selfcamview.cpp
 
-win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -ltoxcore
-
-INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
-DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
-
-win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/toxcore.lib
-else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libtoxcore.a
-
-win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -ltoxav
-
-INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
-DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
-
-win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/toxav.lib
-else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libtoxav.a
-
-win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -lvpx
-
-INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
-DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
-
-win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/vpx.lib
-else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libvpx.a
 
 
-win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -lopus
+### EXAMPLE BUILD SETTINGS FOR WINDOWS
+#win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -ltoxcore
 
-INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
-DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+#INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+#DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
 
-win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/opus.lib
-else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libopus.a
+#win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/toxcore.lib
+#else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libtoxcore.a
 
-win32: LIBS += -lws2_32
+#win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -ltoxav
 
-win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -lsodium
+#INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+#DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
 
-INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
-DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+#win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/toxav.lib
+#else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libtoxav.a
 
-win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/sodium.lib
-else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libsodium.a
+#win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -lvpx
+
+#INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+#DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/vpx.lib
+#else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libvpx.a
+
+
+#win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -lopus
+
+#INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+#DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/opus.lib
+#else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libopus.a
+
+#win32: LIBS += -lws2_32
+
+#win32: LIBS += -L$$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/ -lsodium
+
+#INCLUDEPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+#DEPENDPATH += $$PWD/../../../../Downloads/libtoxcore-win32-i686/include
+
+#win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/sodium.lib
+#else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../../Downloads/libtoxcore-win32-i686/lib/libsodium.a