diff --git a/Makefile b/Makefile
index e4dc3b51a..b5207bdc7 100644
--- a/Makefile
+++ b/Makefile
@@ -356,7 +356,8 @@ VCP_SRC = \
 		   vcp/usb_istr.c \
 		   vcp/usb_prop.c \
 		   vcp/usb_pwr.c \
-		   drivers/serial_usb_vcp.c
+		   drivers/serial_usb_vcp.c \
+		   drivers/usb_io.c
 
 NAZE_SRC = startup_stm32f10x_md_gcc.S \
 		   drivers/accgyro_adxl345.c \
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 1976423cc..3df26829f 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -193,7 +193,7 @@ static const char * const featureNames[] = {
     "SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE",
     "SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM",
     "RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "ONESHOT125",
-    "BLACKBOX", "CHANNEL_FORWARDING", NULL
+    "BLACKBOX", "CHANNEL_FORWARDING", "TRANSPONDER", NULL
 };
 
 // sync this with rxFailsafeChannelMode_e
diff --git a/src/main/io/transponder_ir.h b/src/main/io/transponder_ir.h
index 7c52a4cd0..1ccbee77c 100644
--- a/src/main/io/transponder_ir.h
+++ b/src/main/io/transponder_ir.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+void transponderInit(uint8_t* transponderCode);
 
 void transponderEnable(void);
 void transponderDisable(void);
diff --git a/src/main/main.c b/src/main/main.c
index 1450ae07c..125efdd89 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -33,6 +33,7 @@
 
 #include "drivers/sensor.h"
 #include "drivers/system.h"
+#include "drivers/dma.h"
 #include "drivers/gpio.h"
 #include "drivers/light_led.h"
 #include "drivers/sound_beeper.h"
@@ -52,9 +53,9 @@
 #include "drivers/flash_m25p16.h"
 #include "drivers/sonar_hcsr04.h"
 #include "drivers/gyro_sync.h"
+#include "drivers/sdcard.h"
 #include "drivers/usb_io.h"
 #include "drivers/transponder_ir.h"
-#include "drivers/sdcard.h"
 
 #include "rx/rx.h"
 
@@ -130,8 +131,6 @@ void ledStripInit(ledConfig_t *ledConfigsToUse, hsvColor_t *colorsToUse);
 void spektrumBind(rxConfig_t *rxConfig);
 const sonarHardware_t *sonarGetHardwareConfiguration(batteryConfig_t *batteryConfig);
 void sonarInit(const sonarHardware_t *sonarHardware);
-void transponderInit(uint8_t* transponderCode);
-//void usbCableDetectInit(void);
 
 #ifdef STM32F303xC
 // from system_stm32f30x.c
@@ -256,6 +255,8 @@ void init(void)
 
     timerInit();  // timer must be initialized before any channel is allocated
 
+    dmaInit();
+
     serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL));
 
 #ifdef USE_SERVOS
@@ -534,12 +535,10 @@ void init(void)
     }
 #endif
 
-/* TODO - Fix in the future
 #ifdef USB_CABLE_DETECTION
     usbCableDetectInit();
 #endif
 
-
 #ifdef TRANSPONDER
     if (feature(FEATURE_TRANSPONDER)) {
         transponderInit(masterConfig.transponderData);
@@ -548,7 +547,6 @@ void init(void)
         systemState |= SYSTEM_STATE_TRANSPONDER_ENABLED;
     }
 #endif
-*/
 
 #ifdef USE_FLASHFS
 #ifdef NAZE