diff --git a/include/dsd.h b/include/dsd.h
index ea21a6d..b3e0b33 100644
--- a/include/dsd.h
+++ b/include/dsd.h
@@ -1199,6 +1199,10 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 //P25 Channel to Frequency
 long int process_channel_to_freq (dsd_opts * opts, dsd_state * state, int channel);
 
+//P25 CRC Functions
+int crc16_lb_bridge (int payload[190], int len);
+int crc12_xb_bridge (int payload[190], int len);
+
 //NXDN Channel to Frequency, Courtesy of IcomIcR20 on RR Forums
 long int nxdn_channel_to_frequency (dsd_opts * opts, dsd_state * state, uint16_t channel);
 
@@ -1255,14 +1259,11 @@ void rtl_clean_queue();
 #endif
 
 
-//Phase 2 Helper Functions
+//Phase 2 RS/FEC Functions
 int ez_rs28_ess (int payload[96], int parity[168]); //ezpwd bridge for FME
 int ez_rs28_facch (int payload[156], int parity[114]); //ezpwd bridge for FME
 int ez_rs28_sacch (int payload[180], int parity[132]); //ezpwd bridge for FME
 int isch_lookup (uint64_t isch); //isch map lookup
-int bd_bridge (int payload[196], uint8_t decoded[12]); //bridge to Michael Ossmann Block De-interleaver and 1/2 rate trellis decoder
-int crc16_lb_bridge (int payload[190], int len);
-int crc12_xb_bridge (int payload[190], int len);
 
 #ifdef __cplusplus
 }
diff --git a/src/dsd_frame.c b/src/dsd_frame.c
index 879f8a4..e0ec67e 100644
--- a/src/dsd_frame.c
+++ b/src/dsd_frame.c
@@ -31,7 +31,8 @@ printFrameInfo (dsd_opts * opts, dsd_state * state)
   level = (int) state->max / 164;
   if (opts->verbose > 0)
     {
-      fprintf (stderr,"inlvl: %2i%% ", level);
+      // fprintf (stderr,"inlvl: %2i%% ", level);
+      UNUSED(level);
     }
   if (state->nac != 0)
     {
diff --git a/src/p25_crc.c b/src/p25_crc.c
new file mode 100644
index 0000000..9bcad26
--- /dev/null
+++ b/src/p25_crc.c
@@ -0,0 +1,135 @@
+/*-------------------------------------------------------------------------------
+ * p25_crc.c
+ * P25 Misc CRC checks
+ *
+ * LWVMOBILE
+ * 2022-09 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+
+#include "dsd.h"
+
+//modified from the LEH ComputeCrcCCITT to accept variable len buffer bits
+uint16_t ComputeCrcCCITT16b(const uint8_t buf[], unsigned int len)
+{
+  uint32_t i;
+  uint16_t CRC = 0x0000;
+  uint16_t Polynome = 0x1021;
+  for(i = 0; i < len; i++)
+  {
+    if(((CRC >> 15) & 1) ^ (buf[i] & 1))
+    {
+      CRC = (CRC << 1) ^ Polynome;
+    }
+    else
+    {
+      CRC <<= 1;
+    }
+  }
+
+  /* Invert the CRC */
+  CRC ^= 0xFFFF;
+
+  /* Return the CRC */
+  return CRC;
+} /* End ComputeCrcCCITT() */
+
+//modified from crc12_ok to run a quickie on 16 instead
+static uint16_t crc16_ok(const uint8_t bits[], unsigned int len) {
+	uint16_t crc = 0;
+  // fprintf (stderr, "\n  LEN = %d", len);
+  for (int i = 0; i < 16; i++)
+  {
+    crc = crc << 1;
+    crc = crc | bits[i+len];
+  }
+  uint16_t check = ComputeCrcCCITT16b(bits, len);
+
+  if (crc == check)
+  {
+    //fprintf (stderr, " CRC = %04X %04X", crc, check);
+    return (0);
+  }
+  else
+  {
+    //fprintf (stderr, " CRC = %04X %04X", crc, check);
+    return (-1);
+  }
+
+}
+
+//TSBK/LCCH CRC16 x-bit bridge to crc16b and crc16b_okay, wip, may need multi pdu format as well
+int crc16_lb_bridge (int payload[190], int len)
+{
+  int err = -2;
+  uint8_t buf[190] = {0};
+
+  for (int i = 0; i < len+16; i++) //add +16 here so we load the entire frame but only run crc on the len portion
+  {
+    buf[i] = payload[i];
+  }
+  err = crc16_ok(buf, len);
+  return (err);
+}
+
+//borrowing crc12 from OP25
+static uint16_t crc12(const uint8_t bits[], unsigned int len) {
+	uint16_t crc=0;
+	static const unsigned int K = 12;
+  //g12(x) = x12 + x11 + x7 + x4 + x2 + x + 1
+	static const uint8_t poly[13] = {1,1,0,0,0,1,0,0,1,0,1,1,1}; // p25 p2 crc 12 poly
+	uint8_t buf[256];
+	if (len+K > sizeof(buf)) {
+		//fprintf (stderr, "crc12: buffer length %u exceeds maximum %u\n", len+K, sizeof(buf));
+		return 0;
+	}
+	memset (buf, 0, sizeof(buf));
+	for (unsigned int i=0; i<len; i++){
+		buf[i] = bits[i];
+	}
+	for (unsigned int i=0; i<len; i++)
+		if (buf[i])
+			for (unsigned int j=0; j<K+1; j++)
+				buf[i+j] ^= poly[j];
+	for (unsigned int i=0; i<K; i++){
+		crc = (crc << 1) + buf[len + i];
+	}
+	return crc ^ 0xfff;
+}
+
+//borrowing crc12_ok from OP25
+static uint16_t crc12_ok(const uint8_t bits[], unsigned int len) {
+	uint16_t crc = 0;
+  for (int i = 0; i < 12; i++)
+  {
+    crc = crc << 1;
+    crc = crc | bits[i+len];
+  }
+  uint16_t check = crc12(bits,len);
+
+  if (crc == check)
+  {
+    //fprintf (stderr, " CRC = %03X %03X", crc, check);
+    return (0);
+  }
+  else
+  {
+    //fprintf (stderr, " CRC = %03X %03X", crc, check);
+    return (-1);
+  }
+
+}
+
+//xCCH CRC12 x-bit bridge to crc12b and crc12b_okay
+int crc12_xb_bridge (int payload[190], int len)
+{
+  int err = -5;
+  uint8_t buf[190] = {0};
+
+  //need to load up the 12 crc bits as well, else it will fail on the check, but not on the crc calc
+  for (int i = 0; i < len+12; i++)
+  {
+    buf[i] = payload[i];
+  }
+  err = crc12_ok(buf, len);
+  return (err);
+}
diff --git a/src/p25p1_block.cpp b/src/p25p1_block.cpp
deleted file mode 100644
index 42bdfb2..0000000
--- a/src/p25p1_block.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/*-------------------------------------------------------------------------------
- * p25p1_block.c
- * P25 Block Bridge for TSBK Deinterleaving, CRC12 and CRC16 checks
- *
- * original copyrights for portions used below (OP25, Ossman, and LEH)
- *
- * LWVMOBILE
- * 2022-09 DSD-FME Florida Man Edition
- *-----------------------------------------------------------------------------*/
-
-#include "dsd.h"
-#include <vector>
-
-typedef std::vector<bool> bit_vector;
-
-/* adapted from wireshark/plugins/p25/packet-p25cai.c */
-/* Copyright 2008, Michael Ossmann <mike@ossmann.com>  */
-/* deinterleave and trellis1_2 decoding, count_bits, and find_min*/
-/* buf is assumed to be a buffer of 12 bytes */
-
-//typedef std::vector<bool> bit_vector;
-
-//ugly copy and paste below
-static int count_bits(unsigned int n) {
-            int i = 0;
-            for (i = 0; n != 0; i++)
-                n &= n - 1;
-            return i;
-        }
-
-static int find_min(uint8_t list[], int len) {
-            int min = list[0];
-            int index = 0;
-            int unique = 1;
-            int i;
-
-            for (i = 1; i < len; i++) {
-                if (list[i] < min) {
-                    min = list[i];
-                    index = i;
-                    unique = 1;
-                } else if (list[i] == min) {
-                    //unique = 0;
-                    ; //do nothing, still can be correct and pass CRC
-                }
-            }
-            /* return -1 if a minimum can't be found */
-            if (!unique)
-                return -1;
-
-            return index;
-        }
-
-static int block_deinterleave(bit_vector& bv, unsigned int start, uint8_t* buf)
-{
-  static const uint16_t deinterleave_tb[] = {
-                0,  1,  2,  3,  52, 53, 54, 55, 100,101,102,103, 148,149,150,151,
-                4,  5,  6,  7,  56, 57, 58, 59, 104,105,106,107, 152,153,154,155,
-                8,  9, 10, 11,  60, 61, 62, 63, 108,109,110,111, 156,157,158,159,
-                12, 13, 14, 15,  64, 65, 66, 67, 112,113,114,115, 160,161,162,163,
-                16, 17, 18, 19,  68, 69, 70, 71, 116,117,118,119, 164,165,166,167,
-                20, 21, 22, 23,  72, 73, 74, 75, 120,121,122,123, 168,169,170,171,
-                24, 25, 26, 27,  76, 77, 78, 79, 124,125,126,127, 172,173,174,175,
-                28, 29, 30, 31,  80, 81, 82, 83, 128,129,130,131, 176,177,178,179,
-                32, 33, 34, 35,  84, 85, 86, 87, 132,133,134,135, 180,181,182,183,
-                36, 37, 38, 39,  88, 89, 90, 91, 136,137,138,139, 184,185,186,187,
-                40, 41, 42, 43,  92, 93, 94, 95, 140,141,142,143, 188,189,190,191,
-                44, 45, 46, 47,  96, 97, 98, 99, 144,145,146,147, 192,193,194,195,
-                48, 49, 50, 51 };
-
-            uint8_t hd[4];
-            int b, d, j;
-            int state = 0;
-            uint8_t codeword;
-
-            static const uint8_t next_words[4][4] = {
-                {0x2, 0xC, 0x1, 0xF},
-                {0xE, 0x0, 0xD, 0x3},
-                {0x9, 0x7, 0xA, 0x4},
-                {0x5, 0xB, 0x6, 0x8}
-            };
-
-            memset(buf, 0, 12);
-
-            for (b=0; b < 98*2; b += 4) {
-                codeword = (bv[start+deinterleave_tb[b+0]] << 3) +
-                    (bv[start+deinterleave_tb[b+1]] << 2) +
-                    (bv[start+deinterleave_tb[b+2]] << 1) +
-                    bv[start+deinterleave_tb[b+3]]     ;
-
-                /* try each codeword in a row of the state transition table */
-                for (j = 0; j < 4; j++) {
-                    /* find Hamming distance for candidate */
-                    hd[j] = count_bits(codeword ^ next_words[state][j]);
-                }
-                /* find the dibit that matches the most codeword bits (minimum Hamming distance) */
-                state = find_min(hd, 4);
-                /* error if minimum can't be found */
-                if(state == -1)
-                    return -1;	// decode error, return failure
-                /* It also might be nice to report a condition where the minimum is
-                 * non-zero, i.e. an error has been corrected.  It probably shouldn't
-                 * be a permanent failure, though.
-                 *
-                 * DISSECTOR_ASSERT(hd[state] == 0);
-                 */
-
-                /* append dibit onto output buffer */
-                d = b >> 2;	// dibit ctr
-                if (d < 48) {
-                    buf[d >> 2] |= state << (6 - ((d%4) * 2));
-                }
-            }
-            return 0;
-        }
-
-int bd_bridge (int payload[196], uint8_t decoded[12])
-{
-  std::vector<bool> vc(196,0);
-  int ec = 69; //initialize error value
-
-  //gather payload from tsbk handler and pass it to the block_deinterleave function
-  //and then return its payload back to the tsbk handler
-
-  //initialize our decoded byte buffer with zeroes
-  for (int i = 0; i < 12; i++)
-  {
-    decoded[i] = 0;
-  }
-
-  //convert/load payload into a vector vc to pass to block_deinterleave
-  for (int i = 0; i < 196; i++)
-  {
-    vc[i] = payload[i];
-  }
-  int block_count = 0; //
-  unsigned int start = block_count*196;
-
-  ec = block_deinterleave(vc, start, decoded);
-
-  return ec;
-}
-
-//modified from the LEH ComputeCrcCCITT to accept variable len buffer bits
-uint16_t ComputeCrcCCITT16b(const uint8_t buf[], unsigned int len)
-{
-  uint32_t i;
-  uint16_t CRC = 0x0000; /* Initialization value = 0x0000 */
-  /* Polynomial x^16 + x^12 + x^5 + 1
-   * Normal     = 0x1021
-   * Reciprocal = 0x0811
-   * Reversed   = 0x8408
-   * Reversed reciprocal = 0x8810 */
-  uint16_t Polynome = 0x1021;
-  for(i = 0; i < len; i++)
-  {
-    if(((CRC >> 15) & 1) ^ (buf[i] & 1))
-    {
-      CRC = (CRC << 1) ^ Polynome;
-    }
-    else
-    {
-      CRC <<= 1;
-    }
-  }
-
-  /* Invert the CRC */
-  CRC ^= 0xFFFF;
-
-  /* Return the CRC */
-  return CRC;
-} /* End ComputeCrcCCITT() */
-
-
-//modified from crc12_ok to run a quickie on 16 instead
-static uint16_t crc16_ok(const uint8_t bits[], unsigned int len) {
-	uint16_t crc = 0;
-  // fprintf (stderr, "\n  LEN = %d", len);
-  for (int i = 0; i < 16; i++)
-  {
-    crc = crc << 1;
-    crc = crc | bits[i+len];
-  }
-  // uint16_t check = crc16b(bits,len);
-  uint16_t check = ComputeCrcCCITT16b(bits, len);
-
-  if (crc == check)
-  {
-    //fprintf (stderr, " CRC = %04X %04X", crc, check);
-    return (0);
-  }
-  else
-  {
-    //fprintf (stderr, " CRC = %04X %04X", crc, check);
-    return (-1);
-  }
-
-}
-
-//TSBK/LCCH CRC16 x-bit bridge to crc16b and crc16b_okay, wip, may need multi pdu format as well
-int crc16_lb_bridge (int payload[190], int len)
-{
-  int err = -2;
-  uint8_t buf[190] = {0};
-
-  for (int i = 0; i < len+16; i++) //add +16 here so we load the entire frame but only run crc on the len portion
-  {
-    buf[i] = payload[i];
-  }
-  err = crc16_ok(buf, len);
-  return (err);
-}
-
-//borrowing crc12 from OP25
-static uint16_t crc12(const uint8_t bits[], unsigned int len) {
-	uint16_t crc=0;
-	static const unsigned int K = 12;
-  //g12(x) = x12 + x11 + x7 + x4 + x2 + x + 1
-	static const uint8_t poly[K+1] = {1,1,0,0,0,1,0,0,1,0,1,1,1}; // p25 p2 crc 12 poly
-	uint8_t buf[256];
-	if (len+K > sizeof(buf)) {
-		//fprintf (stderr, "crc12: buffer length %u exceeds maximum %u\n", len+K, sizeof(buf));
-		return 0;
-	}
-	memset (buf, 0, sizeof(buf));
-	for (unsigned int i=0; i<len; i++){
-		buf[i] = bits[i];
-	}
-	for (unsigned int i=0; i<len; i++)
-		if (buf[i])
-			for (unsigned int j=0; j<K+1; j++)
-				buf[i+j] ^= poly[j];
-	for (unsigned int i=0; i<K; i++){
-		crc = (crc << 1) + buf[len + i];
-	}
-	return crc ^ 0xfff;
-}
-
-//borrowing crc12_ok from OP25
-static uint16_t crc12_ok(const uint8_t bits[], unsigned int len) {
-	uint16_t crc = 0;
-  for (int i = 0; i < 12; i++)
-  {
-    crc = crc << 1;
-    crc = crc | bits[i+len];
-  }
-  uint16_t check = crc12(bits,len);
-
-  if (crc == check)
-  {
-    //fprintf (stderr, " CRC = %03X %03X", crc, check);
-    return (0);
-  }
-  else
-  {
-    //fprintf (stderr, " CRC = %03X %03X", crc, check);
-    return (-1);
-  }
-
-}
-
-//xCCH CRC12 x-bit bridge to crc12b and crc12b_okay
-int crc12_xb_bridge (int payload[190], int len)
-{
-  int err = -5;
-  uint8_t buf[190] = {0};
-
-  //need to load up the 12 crc bits as well, else it will fail on the check, but not on the crc calc
-  for (int i = 0; i < len+12; i++)
-  {
-    buf[i] = payload[i];
-  }
-  err = crc12_ok(buf, len);
-  return (err);
-}
diff --git a/src/p25p1_mdpu.c b/src/p25p1_mdpu.c
index f271cba..804eea2 100644
--- a/src/p25p1_mdpu.c
+++ b/src/p25p1_mdpu.c
@@ -43,7 +43,7 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
 
   int dibit = 0;
 
-  uint8_t tsbk_byte[12]; //12 byte return from bd_bridge (block_deinterleave)
+  uint8_t tsbk_byte[12]; //12 byte return from p25_12
   memset (tsbk_byte, 0, sizeof(tsbk_byte));
 
   unsigned long long int PDU[24];
@@ -65,7 +65,7 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
   memset (flushing_bits, 0, sizeof(flushing_bits));
 
   int i, j, k, x;
-  int ec[3]; //error value returned from (block_deinterleave)
+  int ec[3]; //error value returned from p25_12
   int err[2]; //error value returned from ccrc16 or crc32
   memset (ec, -2, sizeof(ec));
   memset (err, -2, sizeof(err));
@@ -110,11 +110,11 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
 
     }
 
-    //send tsbkbit to block_deinterleave and return tsbk_byte
-    // ec[j] = bd_bridge(tsbkbit, tsbk_byte);
-
-    //send tsbkbit to block_deinterleave and return tsbk_byte
-    ec[j] = p25_12 (tsbk_dibit, tsbk_byte);
+    //send tsbkbit to p25_12 and return tsbk_byte
+    if (j == 0) ec[j] = p25_12 (tsbk_dibit, tsbk_byte);
+    //TODO: 3/4 Rate Decodes -- should be able to use the same decoder as DMR 34 rate
+    //else if (rate34)
+    else ec[j] = p25_12 (tsbk_dibit, tsbk_byte);
 
     //too many bit manipulations!
     k = 0;
diff --git a/src/p25p1_tsbk.c b/src/p25p1_tsbk.c
index ce02992..cebc757 100644
--- a/src/p25p1_tsbk.c
+++ b/src/p25p1_tsbk.c
@@ -29,7 +29,7 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
 
   int dibit = 0;
 
-  uint8_t tsbk_byte[12]; //12 byte return from bd_bridge (block_deinterleave)
+  uint8_t tsbk_byte[12]; //12 byte return from p25_12
   memset (tsbk_byte, 0, sizeof(tsbk_byte));
 
   unsigned long long int PDU[24]; //24 byte PDU to send to the tsbk_byte vPDU handler, should be same formats (mostly)
@@ -39,7 +39,7 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
   memset (tsbk_decoded_bits, 0, sizeof(tsbk_decoded_bits));
 
   int i, j, k, x;
-  int ec = -2; //error value returned from (block_deinterleave)
+  int ec = -2; //error value returned from p25_12
   int err = -2; //error value returned from crc16_lb_bridge
   int skipdibit = 14; //initial status dibit will occur at 14, then add 36 each time it occurs
   int protectbit = 0;
@@ -78,9 +78,6 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
     //debug err tally from 1/2 decoder
     // if (ec) fprintf (stderr, " #%d ERR = %d;", j+1, ec);
 
-    //send tsbkbit to block_deinterleave and return tsbk_byte
-    // ec = bd_bridge(tsbkbit, tsbk_byte);
-
     //too many bit manipulations!
     k = 0;
     for (i = 0; i < 12; i++)