diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94fb034c3..1d89a0806 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,8 @@ include("Autogen/CAN/CANfigurator.cmake")
 # Peripherals
 include("${lib_path}/Peripherals/USART/common.cmake")
 include("${lib_path}/Peripherals/CAN/common.cmake")
+
+include("${lib_path}/FancyLayers-RENAME/GRCAN/grcan_fancylayer.cmake")
 include("${lib_path}/FancyLayers-RENAME/ADC/adc.cmake")
 include("${lib_path}/FancyLayers-RENAME/NeoPixel/neopixel.cmake")
 
diff --git a/Lib/FancyLayers-RENAME/GRCAN/Inc/GRCAN_FancyLayer.h b/Lib/FancyLayers-RENAME/GRCAN/Inc/GRCAN_FancyLayer.h
new file mode 100644
index 000000000..9b79e37f2
--- /dev/null
+++ b/Lib/FancyLayers-RENAME/GRCAN/Inc/GRCAN_FancyLayer.h
@@ -0,0 +1,25 @@
+#include <stdint.h>
+
+#include "GR_OLD_MSG_ID.h"
+#include "GR_OLD_NODE_ID.h"
+
+#ifndef GRCAN_FANCYLAYER_H
+#define GRCAN_FANCYLAYER_H
+
+typedef struct {
+	GR_OLD_NODE_ID srcID;
+	GR_OLD_NODE_ID destNode;
+	GR_OLD_MSG_ID messageID;
+} GRCAN_Fancy_ID;
+typedef enum {
+	GRCAN_MODE_CLASSIC,
+	GRCAN_MODE_FD
+} GRCAN_BusMode;
+
+GRCAN_BusMode GRCAN_BusModeForBus(GR_OLD_BUS_ID bus);
+void GRCAN_ConfigureBus(GR_OLD_BUS_ID bus, CANConfig *config);
+
+uint32_t GRCAN_Fancy_DecodeID(GRCAN_Fancy_ID *id);
+void GRCAN_Fancy_EncodeID(GRCAN_Fancy_ID *id, uint32_t rawID);
+
+#endif
diff --git a/Lib/FancyLayers-RENAME/GRCAN/Inc/grcan_utils.h b/Lib/FancyLayers-RENAME/GRCAN/Inc/grcan_utils.h
new file mode 100644
index 000000000..bcb9d118d
--- /dev/null
+++ b/Lib/FancyLayers-RENAME/GRCAN/Inc/grcan_utils.h
@@ -0,0 +1,12 @@
+#include <stdint.h>
+
+#include "GR_OLD_MSG_ID.h"
+#include "GR_OLD_NODE_ID.h"
+
+#ifndef GRCAN_UTILS_H
+#define GRCAN_UTILS_H
+
+uint32_t FDCAN_DLC_BYTES(uint32_t size);
+uint32_t FDCAN_DLC_SIZE(uint32_t dlc);
+
+#endif
diff --git a/Lib/FancyLayers-RENAME/GRCAN/Src/grcan_fancylayer.c b/Lib/FancyLayers-RENAME/GRCAN/Src/grcan_fancylayer.c
new file mode 100644
index 000000000..14806c9ed
--- /dev/null
+++ b/Lib/FancyLayers-RENAME/GRCAN/Src/grcan_fancylayer.c
@@ -0,0 +1,303 @@
+#include <stdint.h>
+
+#include "GR_OLD_BUS_ID.h"
+#include "GR_OLD_MSG_ID.h"
+#include "GR_OLD_NODE_ID.h"
+#include "Logomatic.h"
+#include "can.h"
+#include "main.h"
+
+static CANHandle *grcan_primary;
+static CANHandle *grcan_data;
+static CANHandle *grcan_testing;
+static CANHandle *grcan_charging;
+
+static GR_OLD_NODE_ID grcan_local_node_id;
+
+// void Primary_Bus_Configure(CANConfig *config) {
+// 	grcan_primary = can_init(config);
+// 	can_start(grcan_primary);
+// }
+
+// void Data_Bus_Configure(CANConfig *config) {
+// 	grcan_data = can_init(config);
+// 	can_start(grcan_data);
+// }
+
+// void Testing_Bus_Configure(CANConfig *config) {
+// 	grcan_testing = can_init(config);
+// 	can_start(grcan_testing);
+// }
+
+// void Charger_Bus_Configure(CANConfig *config) {
+// 	grcan_charging = can_init(config);
+// 	can_start(grcan_charging);
+// }
+
+GRCAN_BusMode GRCAN_BusModeForBus(GR_OLD_BUS_ID bus)
+{
+	switch (bus) {
+		case GR_OLD_BUS_PRIMARY:
+			return GRCAN_MODE_FD;
+		case GR_OLD_BUS_TESTING:
+			return GRCAN_MODE_FD;
+		case GR_OLD_BUS_DATA:
+			return GRCAN_MODE_CLASSIC;
+		case GR_OLD_BUS_CHARGING:
+			return GRCAN_MODE_CLASSIC; // update later
+		default:
+			LOGOMATIC("GRCAN_BusModeForBus: unknown bus %d\n", bus);
+			return GRCAN_MODE_CLASSIC;
+	}
+}
+
+CANHandle *GRCAN_GetHandle(GR_OLD_BUS_ID bus)
+{
+	switch (bus) {
+		case GR_OLD_BUS_PRIMARY:
+			return grcan_primary;
+		case GR_OLD_BUS_DATA:
+			return grcan_data;
+		case GR_OLD_BUS_TESTING:
+			return grcan_testing;
+		case GR_OLD_BUS_CHARGING:
+			return grcan_charging;
+		default:
+			return NULL;
+	}
+}
+
+void GRCAN_ConfigureBus(GR_OLD_BUS_ID bus, CANConfig *config)
+{
+	CANHandle **h = NULL;
+	switch (bus) {
+		case GR_OLD_BUS_PRIMARY:
+			h = &grcan_primary;
+			break;
+		case GR_OLD_BUS_DATA:
+			h = &grcan_data;
+			break;
+		case GR_OLD_BUS_TESTING:
+			h = &grcan_testing;
+			break;
+		case GR_OLD_BUS_CHARGING:
+			h = &grcan_charging;
+			break;
+		default:
+			LOGOMATIC("Invalid bus\n");
+			return;
+	}
+
+	*h = can_init(config);
+	if (*h == NULL) {
+		LOGOMATIC("Failed to initialize CAN for bus %d\n", bus);
+		return;
+	}
+	can_start(*h);
+}
+
+void GRCAN_Fancy_Init(GR_OLD_NODE_ID localID, CANHandle *primaryCAN, CANHandle *dataCAN, CANHandle *testingCAN, CANHandle *chargingCAN)
+{
+
+	grcan_local_node_id = localID;
+
+	if (primaryCAN == NULL) {
+		LOGOMATIC("GRCAN_Fancy_Init: Received NULL pointer for primary CAN handle\n");
+	}
+
+	if (dataCAN == NULL) {
+		LOGOMATIC("GRCAN_Fancy_Init: Received NULL pointer for data CAN handle\n");
+	}
+
+	if (testingCAN == NULL) {
+		LOGOMATIC("GRCAN_Fancy_Init: Received NULL pointer for testing CAN handle\n");
+	}
+
+	if (chargingCAN == NULL) {
+		LOGOMATIC("GRCAN_Fancy_Init: Received NULL pointer for charging CAN handle\n");
+	}
+
+	grcan_primary = primaryCAN;
+	grcan_data = dataCAN;
+	grcan_testing = testingCAN;
+	grcan_charging = chargingCAN;
+} // different version of init function, keeping both architectures to see which works better
+
+uint32_t GRCAN_Fancy_DecodeID(GRCAN_Fancy_ID *id)
+{
+	if (id == NULL) {
+		LOGOMATIC("GRCAN_Fancy_Decode: Received NULL pointer\n");
+		return 0;
+	}
+
+	return ((0xFF & id->srcID) << 20) | ((0xFFF & id->messageID) << 8) | (0xFF & id->destNode);
+}
+
+void GRCAN_Fancy_EncodeID(GRCAN_Fancy_ID *id, uint32_t rawID)
+{
+	if (id == NULL) {
+		LOGOMATIC("GRCAN_Fancy_Encode: Received NULL pointer\n");
+		return;
+	}
+
+	id->srcID = (rawID >> 20) & 0xFF;
+	id->destNode = rawID & 0xFF;
+	id->messageID = (rawID >> 8) & 0xFFF;
+}
+
+void GRCAN_Fancy_Send(GR_OLD_BUS_ID bus, GR_OLD_NODE_ID destNode, GR_OLD_MSG_ID messageID, void *data, uint32_t size)
+{
+	GRCAN_Fancy_ID id = {
+	    .srcID = grcan_local_node_id,
+	    .destNode = destNode,
+	    .messageID = messageID,
+	};
+
+	if (id.srcID == GR_ALL) {
+		LOGOMATIC("GRCAN_Fancy_Send: Source ID cannot be GR_ALL\n");
+		return;
+	}
+
+	GRCAN_BusMode mode = GRCAN_BusModeForBus(bus);
+	if (mode == GRCAN_MODE_FD) {
+		GRCAN_Raw_Send_FD(bus, GRCAN_Fancy_DecodeID(&id), data, size);
+		return;
+	} else if (mode == GRCAN_MODE_CLASSIC) {
+		GRCAN_Raw_Send_Classic(bus, GRCAN_Fancy_DecodeID(&id), data, size);
+		return;
+	} else {
+		LOGOMATIC("GRCAN_Fancy_Send: invalid bus mode for bus %d\n", bus);
+		return;
+	}
+}
+
+/*
+identifier can be standard (11-bit) or extended (29-bit)
+TxFrameType can be data or remote frame
+	data frame contains 0-8 bytes of data, RTR dominant (0) - send data
+	remote frame contains no data (still specify DLC), RTR recessive (1) - request data
+		RTR bit automatically encoded with FDCAN_REMOTE_FRAME and FDCAN_DATA_FRAME, no need to manually set it
+ErrorStateIndicator can be active or passive
+DataLength can be 0-8 bytes (classic CAN) and must be set to the number of bytes being sent
+BitRateSwitch can be on or off, but we will always set it to off
+TxEventFifoControl can be set to generate events on transmission
+MessageMarker can be used to identify the message in the Tx event FIFO
+*/
+
+void GRCAN_Raw_Send_Classic(GR_OLD_BUS_ID bus, uint32_t rawID, void *data, uint32_t size)
+{
+	if (size > 8) {
+		LOGOMATIC("GRCAN_Raw_Send_Classic: size %lu > 8 (classic CAN)\n", size);
+		return;
+	}
+
+	FDCANTxHeaderTypeDef header = {
+	    .Identifier = rawID,
+	    .IdType = FDCAN_EXTENDED_ID,     // using extended ID -- src << 20 | msgID << 8 | dest
+	    .TxFrameType = FDCAN_DATA_FRAME, // data frame
+	    .ErrorStateIndicator = FDCAN_ESI_ACTIVE,
+	    .DataLength = FDCAN_DLC_BYTES(size),
+	    .BitRateSwitch = FDCAN_BRS_OFF,
+	    .TxEventFifoControl = FDCAN_NO_TX_EVENTS,
+	    .MessageMarker = 0,
+	};
+
+	FDCANTxMessage msg = {0};
+	msg.tx_header = header;
+	// memcpy(&(msg.data), data, size);
+	memcpy(msg.data, data, size);
+
+	if (GRCAN_BusModeForBus(bus) != GRCAN_MODE_CLASSIC) {
+		LOGOMATIC("GRCAN_Raw_Send_Classic: bus %d is not in classic mode\n", bus);
+		return;
+	}
+
+	CANHandle *handle = GRCAN_GetHandle(bus);
+
+	if (!handle) {
+		LOGOMATIC("GRCAN_Raw_Send_Classic: bus %d not configured\n", bus);
+		return;
+	}
+
+	can_send(handle, &msg);
+	// switch (bus) {
+	// 	case GR_OLD_BUS_PRIMARY:
+	// 		if (!grcan_primary) { LOGOMATIC("ERROR: Primary CAN not configured. Primary Should use FDCAN:\n"); return; }
+	// 		can_send(grcan_primary, &msg);
+	// 		break;
+	// 	case GR_OLD_BUS_DATA:
+	// 		if (!grcan_data) { LOGOMATIC("Data CAN not configured\n"); return; }
+	// 		can_send(grcan_data, &msg);
+	// 		break;
+	// 	case GR_OLD_BUS_TESTING:
+	// 		if (!grcan_testing) { LOGOMATIC("ERROR: Testing CAN not configured. Testing Should use FDCAN:\n"); return; }
+	// 		can_send(grcan_testing, &msg);
+	// 		break;
+	// 	case GR_OLD_BUS_CHARGING:
+	// 		if (!grcan_charging) { LOGOMATIC("Charging CAN not configured\n"); return; }
+	// 		can_send(grcan_charging, &msg);
+	// 		break;
+	// 	default:
+	// 		LOGOMATIC("GRCAN_Raw_Send_Classic: Invalid bus ID %d\n", bus);
+	// 		break;
+	// }
+}
+
+void GRCAN_Raw_Send_FD(GR_OLD_BUS_ID bus, uint32_t rawID, void *data, uint32_t size) // FDCAN funciton allows for modification with different settings
+{
+	if (size > 64) {
+		LOGOMATIC("GRCAN_Raw_Send_FD: size %lu > 64 (CAN FD)\n", size);
+		return;
+	}
+
+	FDCANTxHeaderTypeDef header = {
+	    .Identifier = rawID,
+	    .IdType = FDCAN_EXTENDED_ID,     // using extended ID -- src << 20 | msgID << 8 | dest
+	    .TxFrameType = FDCAN_DATA_FRAME, // data frame
+	    .ErrorStateIndicator = FDCAN_ESI_ACTIVE,
+	    .DataLength = FDCAN_DLC_BYTES(size),
+	    .BitRateSwitch = FDCAN_BRS_OFF,
+	    .TxEventFifoControl = FDCAN_NO_TX_EVENTS,
+	    .MessageMarker = 0,
+	};
+
+	FDCANTxMessage msg = {0};
+	msg.tx_header = header;
+	// memcpy(&(msg.data), data, size);
+	memcpy(msg.data, data, size);
+
+	if (GRCAN_BusModeForBus(bus) != GRCAN_MODE_FD) {
+		LOGOMATIC("GRCAN_Raw_Send_FD: bus %d is not in FD mode\n", bus);
+		return;
+	}
+
+	CANHandle *handle = GRCAN_GetHandle(bus);
+
+	if (!handle) {
+		LOGOMATIC("GRCAN_Raw_Send_FD: bus %d not configured\n", bus);
+		return;
+	}
+
+	can_send(handle, &msg);
+	// switch (bus) {
+	// 	case GR_OLD_BUS_PRIMARY:
+	// 		if (!grcan_primary) { LOGOMATIC("Primary CAN not configured\n"); return; }
+	// 		can_send(grcan_primary, &msg);
+	// 		break;
+	// 	case GR_OLD_BUS_DATA:
+	// 		if (!grcan_data) { LOGOMATIC("ERROR: Data CAN not configured. Data Should use FDCAN:\n"); return; }
+	// 		can_send(grcan_data, &msg);
+	// 		break;
+	// 	case GR_OLD_BUS_TESTING:
+	// 		if (!grcan_testing) { LOGOMATIC("Testing CAN not configured\n"); return; }
+	// 		can_send(grcan_testing, &msg);
+	// 		break;
+	// 	case GR_OLD_BUS_CHARGING:
+	// 		if (!grcan_charging) { LOGOMATIC("ERROR: Charging CAN not configured. Charging Should use FDCAN:\n"); return; }
+	// 		can_send(grcan_charging, &msg);
+	// 		break;
+	// 	default:
+	// 		LOGOMATIC("GRCAN_Raw_Send_FD: Invalid bus ID %d\n", bus);
+	// 		break;
+	// }
+}
diff --git a/Lib/FancyLayers-RENAME/GRCAN/Src/grcan_utils.c b/Lib/FancyLayers-RENAME/GRCAN/Src/grcan_utils.c
new file mode 100644
index 000000000..17efb60fb
--- /dev/null
+++ b/Lib/FancyLayers-RENAME/GRCAN/Src/grcan_utils.c
@@ -0,0 +1,93 @@
+#include <stdint.h>
+
+#include "GRCAN_FancyLayer.h"
+#include "GR_OLD_BUS_ID.h"
+#include "GR_OLD_MSG_ID.h"
+#include "GR_OLD_NODE_ID.h"
+#include "Logomatic.h"
+#include "can.h"
+#include "main.h"
+
+uint32_t FDCAN_DLC_BYTES(uint32_t size)
+{
+	switch (size) {
+		case 0:
+			return FDCAN_DLC_BYTES_0;
+		case 1:
+			return FDCAN_DLC_BYTES_1;
+		case 2:
+			return FDCAN_DLC_BYTES_2;
+		case 3:
+			return FDCAN_DLC_BYTES_3;
+		case 4:
+			return FDCAN_DLC_BYTES_4;
+		case 5:
+			return FDCAN_DLC_BYTES_5;
+		case 6:
+			return FDCAN_DLC_BYTES_6;
+		case 7:
+			return FDCAN_DLC_BYTES_7;
+		case 8:
+			return FDCAN_DLC_BYTES_8;
+		case 12:
+			return FDCAN_DLC_BYTES_12;
+		case 16:
+			return FDCAN_DLC_BYTES_16;
+		case 20:
+			return FDCAN_DLC_BYTES_20;
+		case 24:
+			return FDCAN_DLC_BYTES_24;
+		case 32:
+			return FDCAN_DLC_BYTES_32;
+		case 48:
+			return FDCAN_DLC_BYTES_48;
+		case 64:
+			return FDCAN_DLC_BYTES_64;
+
+		default:
+			LOGOMATIC("Invalid CAN FD size: %lu\n", size);
+			return 0;
+	}
+}
+
+uint32_t FDCAN_DLC_SIZE(uint32_t dlc)
+{
+	switch (dlc) {
+		case FDCAN_DLC_BYTES_0:
+			return 0;
+		case FDCAN_DLC_BYTES_1:
+			return 1;
+		case FDCAN_DLC_BYTES_2:
+			return 2;
+		case FDCAN_DLC_BYTES_3:
+			return 3;
+		case FDCAN_DLC_BYTES_4:
+			return 4;
+		case FDCAN_DLC_BYTES_5:
+			return 5;
+		case FDCAN_DLC_BYTES_6:
+			return 6;
+		case FDCAN_DLC_BYTES_7:
+			return 7;
+		case FDCAN_DLC_BYTES_8:
+			return 8;
+		case FDCAN_DLC_BYTES_12:
+			return 12;
+		case FDCAN_DLC_BYTES_16:
+			return 16;
+		case FDCAN_DLC_BYTES_20:
+			return 20;
+		case FDCAN_DLC_BYTES_24:
+			return 24;
+		case FDCAN_DLC_BYTES_32:
+			return 32;
+		case FDCAN_DLC_BYTES_48:
+			return 48;
+		case FDCAN_DLC_BYTES_64:
+			return 64;
+
+		default:
+			LOGOMATIC("Invalid CAN FD DLC code: %lu\n", dlc);
+			return 8;
+	}
+}
diff --git a/Lib/FancyLayers-RENAME/GRCAN/grcan_fancylayer.cmake b/Lib/FancyLayers-RENAME/GRCAN/grcan_fancylayer.cmake
new file mode 100644
index 000000000..3148a0e69
--- /dev/null
+++ b/Lib/FancyLayers-RENAME/GRCAN/grcan_fancylayer.cmake
@@ -0,0 +1,52 @@
+add_library(GRCAN_FANCYLAYER INTERFACE)
+
+target_include_directories(
+	GRCAN_FANCYLAYER
+	INTERFACE
+		${CMAKE_CURRENT_LIST_DIR}/Inc
+)
+
+target_sources(
+	GRCAN_FANCYLAYER
+	INTERFACE
+		${CMAKE_CURRENT_LIST_DIR}/Src/grcan_fancylayer.c
+)
+
+target_link_libraries(
+	GRCAN_FANCYLAYER
+	INTERFACE
+		GLOBALSHARE_LIB
+		GRCAN_LIB
+)
+
+if(CMAKE_PRESET_NAME STREQUAL "HOOTLTest")
+	# target_compile_definitions(LOGOMATIC_LIB INTERFACE LOGOMATIC_ENABLED)
+
+	# add_executable(logomatic_simple)
+	# target_sources(
+	# 	logomatic_simple
+	# 	PRIVATE
+	# 		${CMAKE_CURRENT_LIST_DIR}/Test/Src/logomatic_simple_print.c
+	# )
+	# target_include_directories(
+	# 	logomatic_simple
+	# 	PRIVATE
+	# 		${CMAKE_CURRENT_LIST_DIR}/Test/Inc
+	# )
+	# target_link_libraries(logomatic_simple PRIVATE LOGOMATIC_LIB)
+	# add_test(logomatic_simple_test logomatic_simple)
+
+	# add_executable(logomatic_float)
+	# target_sources(
+	# 	logomatic_float
+	# 	PRIVATE
+	# 		${CMAKE_CURRENT_LIST_DIR}/Test/Src/logomatic_float_print.c
+	# )
+	# target_include_directories(
+	# 	logomatic_float
+	# 	PRIVATE
+	# 		${CMAKE_CURRENT_LIST_DIR}/Test/Inc
+	# )
+	# target_link_libraries(logomatic_float PRIVATE LOGOMATIC_LIB)
+	# add_test(logomatic_float_test logomatic_float)
+endif()