diff --git a/CANConditionerSketch/CANConditionerSketch.ino b/CANConditionerSketch/CANConditionerSketch.ino
index 437e8d1..8fb0518 100644
--- a/CANConditionerSketch/CANConditionerSketch.ino
+++ b/CANConditionerSketch/CANConditionerSketch.ino
@@ -116,6 +116,8 @@ void setup(void) {
     memcpy(&serial_string[2 * i], &hex_char, 2);
   }
   sprintf(model_string, "CANConditioner");
+  memset(comp_id,0xFF,sizeof(comp_id));
+  sprintf(comp_id,"CSU*CANConditioner*%s*",serial_string);
 
   Serial.print("Config Zone: \t");
   if (atecc.configLockStatus) Serial.println("Locked");
@@ -196,10 +198,11 @@ void setup(void) {
         Serial.printf("PGN: %04X, SA: %02X, DA: %02X, DLC: %d, Data: ", j1939_pgn, j1939_sa, j1939_da, num_bytes);
         print_bytes(j1939_data, num_bytes);
         if (j1939_pgn == DM18_PGN) {
-          Serial.println("Data Security Message Found.");
+          //Serial.println("Data Security Message Found.");
           uint8_t msg_len = j1939_data[0];
           uint8_t msg_type = j1939_data[1];
           if (msg_type == DM18_RESET_TYPE && j1939_sa == gateway_sa) {
+              // TODO: Add some cryptographic primitives to reboot the system.
               setup();
           }
           else if (msg_type == DM18_PUBLIC_KEY_TYPE && msg_len == 64 && j1939_da == self_source_addr) {
@@ -344,6 +347,15 @@ void loop() {
         }
       }
     }
+    else if (j1939_pgn == REQUEST_PGN && 
+             j1939_sa == DIAGNOSTICS_TOOL_1_SA && 
+             j1939_da == get_self_source_addr(0)
+             )
+    {
+      if (j1939_data[0] == 0xEB && j1939_data[1] == 0xFE){ //Component ID Request
+        send_component_id(j1939_sa);  
+      }
+    }
     else if (message_ok){
       ecu_can.write(vehicle_msg);
       AMBER_LED_state = !AMBER_LED_state;  
diff --git a/libraries/SecureJ1939/SecureJ1939.h b/libraries/SecureJ1939/SecureJ1939.h
index a1dcf98..111565a 100644
--- a/libraries/SecureJ1939/SecureJ1939.h
+++ b/libraries/SecureJ1939/SecureJ1939.h
@@ -6,8 +6,12 @@
 FlexCAN_T4<CAN1, RX_SIZE_256, TX_SIZE_1024> vehicle_can;
 FlexCAN_T4<CAN2, RX_SIZE_256, TX_SIZE_1024> ecu_can;
 
-char serial_string[19];
+char make_string[6];
 char model_string[14];
+char serial_string[19];
+//char comp_id[sizeof((make_string)+sizeof(model_string)+2+sizeof(serial_string) + 4)];
+//char comp_id[sizeof(make_string) + sizeof(model_string) + sizeof(serial_string) + 4];
+char comp_id[42];
 uint32_t intrusion_count;
 uint32_t success_count;
 
@@ -111,6 +115,7 @@ int get_sa_index(uint8_t sa){
     if (next_source_address_index >= NUM_SOURCE_ADDRESSES) {
       Serial.println("Source Address Space Exceeded");
       next_source_address_index = 0;
+      sa_index = -1;
     }
   }
   //Serial.printf("Index for %02X is %d\n",sa,sa_index);
@@ -341,16 +346,8 @@ void send_end_of_msg_ack(uint32_t j1939_pgn, uint8_t packets, uint16_t num_bytes
 }
 
 void send_component_id(uint8_t dest){
-  char comp_id[4+sizeof(model_string)+1+sizeof(serial_string)];
-  memset(comp_id,0xFF,sizeof(comp_id));
-  strncpy(&comp_id[0],'CSU*',4);
-  strncpy(&comp_id[4],model_string,sizeof(model_string));
-  comp_id[4+sizeof(model_string)] = '*';
-  strncpy(&comp_id[4+sizeof(model_string)+1],serial_string,sizeof(serial_string));
-  comp_id[sizeof(comp_id) - 1] = '*';
+  Serial.println("Sending Component ID.");
   Serial.println(comp_id);
-  int sa_index = get_sa_index(dest);
-  uint8_t da_index;
   uint8_t packets_to_send = sizeof(comp_id)/7 + bool(sizeof(comp_id)%7);;
   uint8_t data_to_send[8];
   data_to_send[0] = CM_BAM;
@@ -364,8 +361,6 @@ void send_component_id(uint8_t dest){
   //BAM
   send_frame(TP_CM_PGN, dest, self_source_addr, data_to_send, sizeof(data_to_send), NORMAL_PRIORITY);
   uint8_t start_packet = 0;
-  uint8_t temp_buffer[sizeof(comp_id)];
-  memcpy(&temp_buffer[0],comp_id,sizeof(comp_id));
   send_multi_frame(dest, self_source_addr, comp_id, start_packet, packets_to_send);
 }
 
@@ -416,13 +411,13 @@ int parseJ1939(CAN_message_t msg){
   if (da_index == 254) return -1;
  
   if (pgn == REQUEST_PGN){
-    //Serial.print("Found Request PGN: ");
-    //print_bytes(msg.buf,msg.len);
-    j1939_pgn = (msg.buf[2] << 16) + (msg.buf[1] << 8) + msg.buf[0];
+    Serial.print("Found Request PGN: ");
+    print_bytes(msg.buf,msg.len);
+    uint32_t request_pgn = (msg.buf[2] << 16) + (msg.buf[1] << 8) + msg.buf[0];
     // Send a response if the PGN is supported
-    //Serial.printf("%X == %X\n",j1939_pgn,COMPONENT_ID_PGN);
-    if (j1939_pgn == COMPONENT_ID_PGN){
-      send_component_id(GLOBAL_ADDR);
+    Serial.printf("%X == %X, DA: %02X\n",request_pgn,COMPONENT_ID_PGN,da);
+    if (request_pgn == COMPONENT_ID_PGN && da == 254){
+       send_component_id(da);
     }
   }
   else if (pgn == TP_DT_PGN){
diff --git a/libraries/SecureJ1939/SecureJ1939_defs.h b/libraries/SecureJ1939/SecureJ1939_defs.h
index 67494fe..c7d22b4 100644
--- a/libraries/SecureJ1939/SecureJ1939_defs.h
+++ b/libraries/SecureJ1939/SecureJ1939_defs.h
@@ -47,6 +47,7 @@
 #define NORMAL_PRIORITY 6
 #define GLOBAL_ADDR     255
 #define GATEWAY_SOURCE_ADDR  37
+#define DIAGNOSTICS_TOOL_1_SA 249
 
 #define J1939_MAX_LENGTH 1785