diff --git a/src/base/bang-net.c b/src/base/bang-net.c
index 92212e1..22a7107 100644
--- a/src/base/bang-net.c
+++ b/src/base/bang-net.c
@@ -6,6 +6,7 @@
  * \brief Implementation of the networking behind the BANG project.
  * */
 #include"bang-net.h"
+#include"bang-signals.h"
 #include<stdio.h>
 #include<errno.h>
 #include<netdb.h>
@@ -49,9 +50,7 @@ void* BANG_network_thread(void *port) {
 			perror("Bind failed");
 		}
 		else if (bind(sock,rp->ai_addr,rp->ai_addrlen) == 0) {
-			/**
-			 * TODO: Make this send out a signal before returning.
-			 */
+			BANG_send_signal(BANG_BIND_SUC,NULL);
 			printf("Bind succeeded.\n");
 			fflush(stdout);
 			break;
diff --git a/src/base/core.c b/src/base/core.c
index fb226e8..df7e4a0 100644
--- a/src/base/core.c
+++ b/src/base/core.c
@@ -40,7 +40,7 @@ void BANG_init(int *argc, char **argv) {
 }
 
 void BANG_close() {
-	BANG_sig_close();
 	pthread_join(*netthread,NULL);
 	free(netthread);
+	BANG_sig_close();
 }