diff --git a/firmware/src/main.c b/firmware/src/main.c
index 75ac963..8b859e1 100644
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -307,13 +307,7 @@ int main(void)
   /* Configure the Power Manager */
   //powermananger_init();
 
-  /* Timer 0 clocks out data */
-#ifdef RTTY
-  timer0_tick_init(50);
-#endif
-#ifdef CONTESTIA
-  timer0_tick_init(31.25);
-#endif
+
 
   /**
    * System initialisation
@@ -351,6 +345,15 @@ int main(void)
 
   started = 1;
 
+
+  /* Timer 0 clocks out data */
+#ifdef RTTY
+  timer0_tick_init(50);
+#endif
+#ifdef CONTESTIA
+  timer0_tick_init(31.25);
+#endif
+
   led_on();
 
   while (1) {
@@ -385,13 +388,21 @@ void TC0_Handler(void)
         grey_code = (binary_code >> 1) ^ binary_code;
 
         si_trx_switch_channel(grey_code);
-        tone_index++;
-      } else if (tone_index > 96) {
 
-        tone_index = 0;
-      } else {
+      } else if (tone_index < 64) {
+
         si_trx_state_ready();
-        tone_index++;
+
+      /* } else if (tone_index < 96) { */
+
+      /*   si_trx_switch_channel((tone_index & 1) ? 0 : 31); */
+
+      }
+
+      tone_index++;
+      if (tone_index >= 64)
+      {
+        tone_index = 0;
       }
     }
 #endif
diff --git a/firmware/src/telemetry.c b/firmware/src/telemetry.c
index 038aeff..66f5bb9 100644
--- a/firmware/src/telemetry.c
+++ b/firmware/src/telemetry.c
@@ -28,7 +28,9 @@
 #include "samd20.h"
 #include "system/gclk.h"
 #include "system/interrupt.h"
+#include "system/pinmux.h"
 #include "tc/tc_driver.h"
+#include "hw_config.h"
 
 
 /**
@@ -72,20 +74,53 @@ uint16_t crc_checksum(char *string)
   return crc;
 }
 
+
+
+
+
+
+
+
+
+void si_gclk_setup(void)
+{
+  system_pinmux_pin_set_config(SI406X_TCXO_PINMUX >> 16,	/* GPIO Pin	*/
+			       SI406X_TCXO_PINMUX & 0xFFFF,	/* Mux Position	*/
+			       SYSTEM_PINMUX_PIN_DIR_INPUT,	/* Direction	*/
+			       SYSTEM_PINMUX_PIN_PULL_NONE,	/* Pull		*/
+			       false);    			/* Powersave	*/
+
+  system_gclk_gen_set_config(SI406X_TCXO_GCLK,
+			     GCLK_SOURCE_GCLKIN, /* Source 		*/
+			     false,		/* High When Disabled	*/
+			     1,			/* Division Factor	*/
+			     false,		/* Run in standby	*/
+			     false);		/* Output Pin Enable	*/
+  system_gclk_gen_enable(SI406X_TCXO_GCLK);
+}
+
+
+
+
+
 /**
  * Initialises a timer interupt at the given frequency
  */
 void timer0_tick_init(float frequency)
 {
+  //si_gclk_setup();
+
   /* Calculate the wrap value for the given frequency */
-  float gclk0_frequency = (float)system_gclk_chan_get_hz(0);
-  uint32_t count = (uint32_t)(gclk0_frequency / frequency);
+  //float gclk_frequency = SI406X_TCXO_FREQUENCY;
+  float gclk_frequency = (float)system_gclk_chan_get_hz(0);
+  uint32_t count = (uint32_t)(gclk_frequency / frequency);
 
   /* Configure Timer 0 */
   bool t0_capture_channel_enables[]    = {false, false};
   uint32_t t0_compare_channel_values[] = {count, 0x0000};
   tc_init(TC0,
-	  GCLK_GENERATOR_0,
+//	  GCLK_GENERATOR_3,
+          GCLK_GENERATOR_0,
 	  TC_COUNTER_SIZE_32BIT,
 	  TC_CLOCK_PRESCALER_DIV1,
 	  TC_WAVE_GENERATION_MATCH_FREQ,