diff --git a/.gitmodules b/.gitmodules
index 0f0686f..1cd02b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "components/blk_box_lib"]
 	path = components/blk_box_lib
 	url = https://git.marinodev.com/MarinoDev/blk_box_lib.git
+[submodule "components/blk_box_common"]
+	path = components/blk_box_common
+	url = https://git.marinodev.com/MarinoDev/blk_box_common.git
diff --git a/components/blk_box_common b/components/blk_box_common
new file mode 160000
index 0000000..de35723
--- /dev/null
+++ b/components/blk_box_common
@@ -0,0 +1 @@
+Subproject commit de3572385ba4720ef0edb43ae4217c40e021ce84
diff --git a/components/blk_box_lib b/components/blk_box_lib
index 7505217..d5a7aa1 160000
--- a/components/blk_box_lib
+++ b/components/blk_box_lib
@@ -1 +1 @@
-Subproject commit 75052174a60977d440780f94051ae69d1fba1dd5
+Subproject commit d5a7aa1891f09abd19b74225f0bce95d231435da
diff --git a/dependencies.lock b/dependencies.lock
index 8021c32..75f0826 100644
--- a/dependencies.lock
+++ b/dependencies.lock
@@ -12,10 +12,10 @@ dependencies:
   idf:
     source:
       type: idf
-    version: 6.0.0
+    version: 6.0.1
 direct_dependencies:
 - espressif/led_strip
 - idf
-manifest_hash: d8fb11fe9d2246f588be185955562c86050e5dc4c222815277426614f2136bfe
+manifest_hash: 104ee01597639c0b6c90ebbe71e61d9642bbc422f80747aa239202863e58174a
 target: esp32s3
 version: 3.0.0
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 11c046f..be0e165 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -5,4 +5,15 @@ idf_component_register(
         esp_driver_i2c
         spi_flash 
         blk_box_lib
-    INCLUDE_DIRS "")
+        blk_box_common
+
+        esp_event 
+        esp_netif 
+        esp_wifi
+        nvs_flash 
+    INCLUDE_DIRS ""
+)
+
+target_compile_options(${COMPONENT_LIB} PRIVATE
+    -Wno-error=missing-field-initializers
+)
diff --git a/main/main.cpp b/main/main.cpp
index ff3f6ca..2279cd7 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1,7 +1,10 @@
+#include "bbnow.hpp"
+#include "freertos/FreeRTOS.h"
 #include <stdio.h>
 #include <inttypes.h>
+#include "esp_wifi_types_generic.h"
+#include "freertos/projdefs.h"
 #include "sdkconfig.h"
-#include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_chip_info.h"
 #include "esp_flash.h"
@@ -14,6 +17,108 @@
 #include "blk_box_drivers/ssegs.hpp"
 #include "blk_box_drivers/helpers.hpp"
 
+
+#include "esp_log.h"
+#include "esp_event.h"
+#include "esp_netif.h"
+#include "esp_wifi.h"
+#include "esp_log.h"
+#include "esp_mac.h"
+#include "esp_now.h"
+#include "esp_crc.h"
+#include "nvs_flash.h"
+
+
+#define ESPNOW_CHANNEL 6
+#define ESPNOW_DATA_MAX_LEN 24
+
+const static char TAG[] = "main";
+
+
+const static uint8_t ESPNOW_PMK[16] = {0x4F, 0xA2, 0x8E, 0x11, 0xD7, 0x6C, 0xB5, 0x3E, 0x94, 0xF0, 0x2A, 0x83, 0xC6, 0x9D, 0x1B, 0x5E};
+
+const static uint8_t BROADCAST_MAC[ESP_NOW_ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+
+static void example_espnow_send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status);
+static void example_espnow_recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *data, int len);
+
+
+void init_nvs(void) {
+    esp_err_t ret = nvs_flash_init();
+    if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
+        ESP_ERROR_CHECK( nvs_flash_erase() );
+        ret = nvs_flash_init();
+    }
+    ESP_ERROR_CHECK( ret );
+}
+
+void init_wifi(void)
+{
+    ESP_ERROR_CHECK(esp_netif_init());
+    ESP_ERROR_CHECK(esp_event_loop_create_default());
+    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
+    ESP_ERROR_CHECK( esp_wifi_init(&cfg) );
+    ESP_ERROR_CHECK( esp_wifi_set_storage(WIFI_STORAGE_RAM) );
+    ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_AP) );
+    ESP_ERROR_CHECK( esp_wifi_start());
+    ESP_ERROR_CHECK( esp_wifi_set_channel(ESPNOW_CHANNEL, WIFI_SECOND_CHAN_NONE));
+
+    // enable long range
+    // ESP_ERROR_CHECK( esp_wifi_set_protocol(ESPNOW_WIFI_IF, WIFI_PROTOCOL_11B|WIFI_PROTOCOL_11G|WIFI_PROTOCOL_11N|WIFI_PROTOCOL_LR) );
+}
+
+void init_espnow(void) {
+    ESP_ERROR_CHECK( esp_now_init() );
+    ESP_ERROR_CHECK( esp_now_register_send_cb(example_espnow_send_cb) );
+    ESP_ERROR_CHECK( esp_now_register_recv_cb(example_espnow_recv_cb) );
+
+    /* Set primary master key. */
+    ESP_ERROR_CHECK( esp_now_set_pmk(ESPNOW_PMK));
+
+    // Add broadcast peer information to peer list, allowing us to send to it
+    esp_now_peer_info_t peer = {0};
+    peer.channel = ESPNOW_CHANNEL;
+    peer.ifidx = WIFI_IF_AP;
+    peer.encrypt = false;
+    memcpy(peer.peer_addr, BROADCAST_MAC, ESP_NOW_ETH_ALEN);
+    ESP_ERROR_CHECK( esp_now_add_peer(&peer) );
+}
+
+/* ESPNOW sending or receiving callback function is called in WiFi task.
+ * Users should not do lengthy operations from this task. Instead, post
+ * necessary data to a queue and handle it from a lower priority task. */
+static void example_espnow_send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status)
+{
+    if (tx_info == NULL) {
+        ESP_LOGE(TAG, "Send cb arg error");
+        return;
+    }
+    ESP_LOGI(TAG, "sending espnow packet of size: %d to " MACSTR, tx_info->data_len, MAC2STR(tx_info->des_addr));
+}
+
+static void example_espnow_recv_cb(const esp_now_recv_info_t *recv_info, const uint8_t *data, int len)
+{
+    uint8_t * src_addr = recv_info->src_addr;
+    uint8_t * des_addr = recv_info->des_addr;
+
+    if (src_addr == NULL || data == NULL || len <= 0) {
+        ESP_LOGE(TAG, "Receive cb arg error");
+        return;
+    }
+
+    ESP_LOGI(TAG, "got espnow packet of size: %d from " MACSTR " to " MACSTR, MAC2STR(src_addr), MAC2STR(des_addr));
+
+    // if (IS_BROADCAST_ADDR(des_addr)) {
+    //     /* If added a peer with encryption before, the receive packets may be
+    //      * encrypted as peer-to-peer message or unencrypted over the broadcast channel.
+    //      * Users can check the destination address to distinguish it.
+    //      */
+    //     ESP_LOGD(TAG, "Receive broadcast ESPNOW data");
+    // } else {
+    //     ESP_LOGD(TAG, "Receive unicast ESPNOW data");
+    // }
+}
+
 extern "C" void app_main(void) {
     BlkBoxInitConfig blk_box_cfg = {};
     init_blk_box(blk_box_cfg);
@@ -28,6 +133,30 @@ extern "C" void app_main(void) {
     SSegController::enable_game_timer();
     SSegController::enable_module_timer();
 
+    ESP_LOGI(TAG, "initializing nvs");
+    init_nvs();
+    ESP_LOGI(TAG, "initializing wifi");
+    init_wifi();
+    ESP_LOGI(TAG, "initializing espnow");
+    init_espnow();
+    ESP_LOGI(TAG, "initialized!");
+
+    // uint8_t mac[6];
+    // ESP_ERROR_CHECK(esp_wifi_get_mac(WIFI_IF_STA, mac));
+    // ESP_LOGI(TAG, "My MAC: %02X:%02X:%02X:%02X:%02X:%02X",
+    //          mac[0], mac[1], mac[2],
+    //          mac[3], mac[4], mac[5]);
+
+    // BBNowPubPacket tens_discovery_packet = BBNowPubPacket::new_discovery(BlkBoxNowPubDiscoveryData {
+    //     .expantion_type = BlkBoxExpantion::TENS,
+    // });
+    // while (1) {
+    //     auto buf = tens_discovery_packet.serialize();
+    //     ESP_LOGI(TAG, "sending packet of size %d from main", buf.size());
+    //     ESP_ERROR_CHECK(esp_now_send(BROADCAST_MAC, buf.data(), buf.size()));
+    //     vTaskDelay(pdMS_TO_TICKS(1000));
+    // }
+
     uint32_t i = 0;
 
     while (1) {