diff --git a/slave/slave/lib/masterComm.c b/slave/slave/lib/masterComm.c
--- a/slave/slave/lib/masterComm.c
+++ b/slave/slave/lib/masterComm.c
@@ -14,43 +14,83 @@
 #include "serparser.h"
 #include "inputOutput.h"
 
+uint8_t dataTypes;
 char buff2[64];
 
-void masterComm_send()
+void masterComm_types()
 {
-	serial0_sendString("[@");
 	switch(io_getModuleId())
 	{
 		case 0:
 			// Generic
-			snprintf(buff2,64,"%u",DATATYPES_GENERIC);
+			dataTypes = DATATYPES_GENERIC;
 			break;
 			
 		case 1:
 			// Sensors
-			snprintf(buff2,64,"%u",DATATYPES_SENSOR);
+			dataTypes = DATATYPES_SENSOR;
 			break;
 			
 		case 2:
 			// Geiger
-			snprintf(buff2,64,"%u",DATATYPES_GEIGER);
+			dataTypes = DATATYPES_GEIGER;
 			break;
 			
 		case 3:
 			// Camera
-			snprintf(buff2,64,"%u",DATATYPES_CAMERA);
+			dataTypes = DATATYPES_CAMERA;
 			break;
 			
 		default:
-			snprintf(buff2,64,"%u",DATATYPES_GENERIC);
+			dataTypes = DATATYPES_GENERIC;
+			break;
+	}
+}
+
+
+void masterComm_modules()
+{
+	switch(io_getModuleId())
+	{
+		case 0:
+			// Generic
+			
+			break;
+		
+		case 1:
+			// Sensors
+			
 			break;
-	}
-	
+		
+		case 2:
+			// Geiger
+			
+			break;
+		
+		case 3:
+			// Camera
+			
+			break;
+		
+		default:
+			
+			break;
+	}
+}
+
+
+void masterComm_send()
+{
+	masterComm_types();
+	serial0_sendString("[@");
+	snprintf(buff2,64,"%u]%u",dataTypes,('@'+dataTypes));
 	serial0_sendString(buff2);
-
-
 	
-	serial0_sendString("got data\r\n");
+	masterComm_modules();
+
+	
+	
+	serial0_sendString("got request\r\n");		//DEBUG
 }
 
 
diff --git a/slave/slave/lib/masterComm.h b/slave/slave/lib/masterComm.h
--- a/slave/slave/lib/masterComm.h
+++ b/slave/slave/lib/masterComm.h
@@ -9,6 +9,8 @@
 #define MASTERCOMM_H_
 
 
+void masterComm_types();	// Calculates the number of types the module has
+void masterComm_modules();	// Sends sensor data depending on module
 
 void masterComm_check();	// Runs parser and checks for data request
 void masterComm_send();		// Sends data after being requested