diff --git a/src/teensy_dsc/cli.cpp b/src/teensy_dsc/cli.cpp
index bfd2fa9..efe2335 100644
--- a/src/teensy_dsc/cli.cpp
+++ b/src/teensy_dsc/cli.cpp
@@ -4,7 +4,7 @@
 #include "cli.h"
 #include "utils.h"
 #include "defaults.h"
-#include "wifly.h"
+#include "network.h"
 
 void setup_commands(cli_ctx *ctx);
 
@@ -12,7 +12,7 @@ void setup_commands(cli_ctx *ctx);
  * Initalizer for a CLI context
  */
 cli_ctx *
-cli_init_cmd(AnySerial *aserial, common_cli_ctx *common, WiFlySerial *wifly) {
+cli_init_cmd(AnySerial *aserial, common_cli_ctx *common, WiFly *wifly) {
     cli_ctx *ctx;
 
     ctx = (cli_ctx *)malloc(sizeof(cli_ctx));
@@ -22,6 +22,11 @@ cli_init_cmd(AnySerial *aserial, common_cli_ctx *common, WiFlySerial *wifly) {
     ctx->prev_state = NONE;
     ctx->serial = aserial;
     ctx->wifly = wifly;
+    if (wifly == NULL) {
+        ctx->eat_errors = true;
+    } else {
+        ctx->eat_errors = false;
+    }
     setup_commands(ctx);
 
     return ctx;
@@ -257,7 +262,9 @@ wifi_interactive(cli_ctx *ctx) {
                 if (pos == READBUFF_SIZE) {
                     line[0] = NULL;
                     pos = 0;
-                    ctx->serial->printf("ERR: command too long\n");
+                    if (! ctx->eat_errors) {
+                        ctx->serial->printf("ERR: command too long\n");
+                    }
                 }
             }
         }
@@ -302,13 +309,15 @@ setup_commands(cli_ctx *ctx) {
  */
 cmd_status
 wifi_ap_commands(cli_ctx *ctx, const char *args) {
-    if (strcmp(args, "ON") == 0) {
-        wifi_initial_setup(ctx->wifly, ctx->common->network);
-    } else if (strcmp(args, "OFF") == 0) {
-        // TODO: do something
-        ctx->serial->printf("Doh, this command doesn't do anything yet!\n");
+    if (strcmp(args, "SAVE") == 0) {
+        wifi_configure(ctx->wifly, ctx->common->network);
+        ctx->serial->printf("OK\n");
     } else if (strcmp(args, "SHOW") == 0) {
         wifi_get_config(ctx->wifly, ctx->serial);
+        ctx->serial->printf("OK\n");
+    } else if (strcmp(args, "RESET") == 0) {
+        ctx->wifly->reset();
+        ctx->serial->printf("OK\n");
     } else {
         return E_CMD_NOT_FOUND;
     }
@@ -321,18 +330,26 @@ wifi_ap_commands(cli_ctx *ctx, const char *args) {
 cmd_status
 wifi_get_help(cli_ctx *ctx, const char *args) {
     ctx->serial->printf(
-F("AP ON                 => Turn on the WiFi access point\n" \
-"AP OFF                => Turn off the WiFi access point\n"  \
+F("AP SAVE               => Save WiFi access point config\n" \
 "AP SHOW               => Shows the WiFi configuration\n"    \
+"AP RESET              => Reset WiFi to factory defaults\n"  \
 "SET SSID <ssid>       => Set the WiFi SSID\n"               \
 "SET PASS <pass>       => Set the WiFi passphrase\n"         \
 "SET IP <x.x.x.x>      => Set the WiFi IP address\n"         \
 "SET MASK <x.x.x.x>    => Set the WiFi netmask\n"            \
 "SET CHAN <x>          => Set the WiFi channel [0-12]\n"     \
 "SET PORT <x>          => Set the TCP PORT [1-65535]\n"      \
+"SET RATE <x>          => Set the WiFi rate [0-15]\n"        \
+"SET TXP <x>           => Set the WiFi TX Power [0-12]\n"    \
 "SET AUTH [WPA2|OPEN]  => Enable WPA2-PSK or no security\n"  \
+"SET MODE [AP|CLIENT]  => Enable AP or client mode\n"        \
+"SET ALT xxxx          => set ALT encoder resolution\n"      \
+"SET AZ xxxx           => set AZ encoder resolution\n"       \
 "GET <OPTION>          => Get a config option\n"             \
-"SAVE                  => Save Wifi settings to flash\n"     \
+"GET IPA               => Get IP of WiFi AP\n"               \
+"GET ALL               => Get all saved EEPROM settings\n"   \
+"SAVE                  => Save settings to EEPROM\n"         \
+"CLEAR                 => Clear all EEPROM settings\n"       \
 "?                     => Help\n"                            \
 "MODE [DSC|WIFI]       => Change CLI mode\n")
     );
@@ -368,22 +385,16 @@ wifi_set_option(cli_ctx *ctx, const char *args) {
         }
     }
     value[j] = '\0';
-
     if (strcmp("SSID", option) == 0) {
-        ctx->wifly->setSSID(value);
         strncpy(network->ssid, value, 30);
         ctx->serial->printf("OK: %s\n", value);
     } else if (strcmp("PASS", option) == 0) {
-        ctx->wifly->setPassphrase(value);
         strncpy(network->passphrase, value, 64);
         ctx->serial->printf("OK: %s\n", value);
     } else if (strcmp("IP", option) == 0) {
-        ctx->wifly->setIP(value);
-        ctx->wifly->setGateway(value);
         strncpy(network->ip_address, value, 15);
         ctx->serial->printf("OK: %s\n", value);
     } else if (strcmp("MASK", option) == 0) {
-        ctx->wifly->setNetMask(value);
         strncpy(network->netmask, value, 15);
         ctx->serial->printf("OK: %s\n", value);
     } else if (strcmp("CHAN", option) == 0) {
@@ -392,7 +403,6 @@ wifi_set_option(cli_ctx *ctx, const char *args) {
             ctx->serial->printf("Invalid channel: %d\n", i);
             return E_CMD_BAD_ARGS;
         }
-        ctx->wifly->setChannel(value);
         network->channel = (uint8_t)i;
         ctx->serial->printf("OK: %d\n", i);
     } else if (strcmp("PORT", option) == 0) {
@@ -401,24 +411,57 @@ wifi_set_option(cli_ctx *ctx, const char *args) {
             ctx->serial->printf("Invalid port: %d\n", i);
             return E_CMD_BAD_ARGS;
         }
-        ctx->wifly->setLocalPort(i);
         network->port = (uint16_t)i;
         ctx->serial->printf("OK: %d\n", i);
     } else if (strcmp("AUTH", option) == 0) {
         if (strcmp("OPEN", value) == 0) {
-            ctx->wifly->setAuthMode(0);
             network->enable_wpa = 0;
             ctx->serial->printf("OK: %d\n", 0);
         } else if (strcmp("WPA2", value) == 0) {
-            ctx->wifly->setAuthMode(4);
             network->enable_wpa = 4;
-        ctx->serial->printf("OK: %d\n", 4);
         } else {
             ctx->serial->printf("Invalid auth mode: %s\n", value);
             return E_CMD_BAD_ARGS;
         }
+    } else if (strcmp("MODE", option) == 0) {
+        if (strcmp("AP", value) == 0) {
+            network->enable_ap = 7;
+            ctx->serial->printf("OK: %d\n", 7);
+        } else if (strcmp("CLIENT", value) == 0) {
+            network->enable_ap = 1;
+            ctx->serial->printf("OK: %d\n", 1);
+        } else {
+            ctx->serial->printf("Invalid Wifi mode: %d\n", value);
+            return E_CMD_BAD_ARGS;
+        }
+    } else if (strcmp("RATE", option) == 0) {
+        i = atoi(value);
+        if (i < 0 || i > 15) {
+            ctx->serial-printf("Invalid rate: %d\n", i);
+            return E_CMD_BAD_ARGS;
+        }
+        network->rate = i;
+        ctx->serial->printf("OK: %d\n", i);
+    } else if (strcmp("TXP", option) == 0) {
+        i = atoi(value);
+        if (i < 0 || 0 > 12) {
+            ctx->serial-printf("Invalid TX Power: %d\n", i);
+            return E_CMD_BAD_ARGS;
+        }
+        network->tx_power = i;
+        ctx->serial->printf("OK: %d\n", i);
+    } else if (strcmp("ALT", option) == 0) {
+        i = atoi(value);
+        ctx->common->dec_value = i;
+        ctx->serial->printf("OK: %d\n", i);
+    } else if (strcmp("AZ", option) == 0) {
+        i = atoi(value);
+        ctx->common->ra_value = i;
+        ctx->serial->printf("OK: %d\n", i);
+    } else {
+        ctx->serial->printf("Unknown command: %s\n", option);
+        return E_CMD_NOT_FOUND;
     }
-
     return E_CMD_OK;
 }
 
@@ -429,37 +472,99 @@ cmd_status
 wifi_get_option(cli_ctx *ctx, const char *args) {
     AnySerial *serial = ctx->serial;
     network_settings_t *network = ctx->common->network;
+    char c, *value;
 
     if (strcmp("SSID", args) == 0) {
-        serial->printf("%s\n", network->ssid);
+        serial->printf("SSID: %s\n", network->ssid);
     } else if (strcmp("PASS", args) == 0) {
-        serial->printf("%s\n", network->passphrase);
+        serial->printf("PASS: %s\n", network->passphrase);
     } else if (strcmp("IP", args) == 0) {
-        serial->printf("%s\n", network->ip_address);
+        serial->printf("IP: %s\n", network->ip_address);
     } else if (strcmp("MASK", args) == 0) {
-        serial->printf("%s\n", network->netmask);
+        serial->printf("MASK: %s\n", network->netmask);
     } else if (strcmp("CHAN", args) == 0) {
-        serial->printf("%d\n", network->channel);
+        serial->printf("CHAN: %d\n", network->channel);
     } else if (strcmp("PORT", args) == 0) {
-        serial->printf("%d\n", network->port);
+        serial->printf("PORT: %d\n", network->port);
     } else if (strcmp("AUTH", args) == 0) {
         switch (network->enable_wpa) {
             case 0:
-                serial->printf(F("OPEN\n"));
+                serial->printf(F("AUTH: OPEN\n"));
+                break;
+            case 4:
+                serial->printf(F("AUTH: WPA2\n"));
+                break;
+            default:
+                serial->printf(F("AUTH: Unknown value: %d\n"), network->enable_wpa);
+        }
+    } else if (strcmp("MODE", args) == 0) {
+        switch (network->enable_ap) {
+            case 7:
+                serial->printf("MODE: AP\n");
+                break;
+            case 1:
+                serial->printf("MODE: WiFi Client\n");
+                break;
+            default:
+                serial->printf("Mode: Unknown: %d\n", network->enable_ap);
+        }
+    } else if (strcmp("RATE", args) == 0) {
+        serial->printf("RATE: %d\n", network->rate);
+    } else if (strcmp("TXP", args) == 0) {
+        serial->printf("TXP: %d\n", network->tx_power);
+    } else if (strcmp("IPA", args) == 0) {
+        ctx->wifly->sendCommand("get ip a\r");
+        serial->print("IPA: ");
+        while (ctx->wifly->receive((uint8_t *)&c, 1, 300)) {
+            serial->print((char)c);
+        }
+        ctx->wifly->dataMode();
+    } else if (strcmp("ALT", args) == 0) {
+        value = EncoderValue(ctx->common->dec_value, true);
+        serial->printf("ALT: %s\n", value);
+    } else if (strcmp("AZ", args) == 0) {
+        value = EncoderValue(ctx->common->ra_value, true);
+        serial->printf("AZ: %s\n", value);
+    } else if (strcmp("ALL", args) == 0) {
+        serial->printf("SSID: %s\n", network->ssid);
+        serial->printf("PASS: %s\n", network->passphrase);
+        serial->printf("IP: %s\n", network->ip_address);
+        serial->printf("MASK: %s\n", network->netmask);
+        serial->printf("CHAN: %d\n", network->channel);
+        serial->printf("PORT: %d\n", network->port);
+        switch (network->enable_wpa) {
+            case 0:
+                serial->printf(F("AUTH: OPEN\n"));
                 break;
             case 4:
-                serial->printf(F("WPA2\n"));
+                serial->printf(F("AUTH: WPA2\n"));
+                break;
+            default:
+                serial->printf(F("AUTH: Unknown value: %d\n"), network->enable_wpa);
+        }
+        switch (network->enable_ap) {
+            case 7:
+                serial->printf("MODE: AP\n");
+                break;
+            case 1:
+                serial->printf("MODE: WiFi Client\n");
                 break;
             default:
-                serial->printf(F("Unknown value: %d\n"), network->enable_wpa);
+                serial->printf("Mode: Unknown: %d\n", network->enable_ap);
         }
+        serial->printf("RATE: %d\n", network->rate);
+        serial->printf("TXP: %d\n", network->tx_power);
+        value = EncoderValue(ctx->common->dec_value, true);
+        serial->printf("ALT: %s\n", value);
+        value = EncoderValue(ctx->common->ra_value, true);
+        serial->printf("AZ: %s\n", value);
     }
 
     return E_CMD_OK;
 }
 
 /*
- * Save Wifi Settings
+ * Save Wifi Settings to EEPROM
  */
 cmd_status 
 wifi_save_settings(cli_ctx *ctx, const char *args) {
diff --git a/src/teensy_dsc/cli.h b/src/teensy_dsc/cli.h
index b392c7b..f2c1380 100644
--- a/src/teensy_dsc/cli.h
+++ b/src/teensy_dsc/cli.h
@@ -1,4 +1,4 @@
-#include "wifly.h"
+#include "network.h"
 
 #ifndef __CLI_H__
 #define __CLI_H__
@@ -47,15 +47,16 @@ typedef struct cli_ctx_s {
     cli_state state;
     cli_state prev_state;
     AnySerial *serial;
-    WiFlySerial *wifly;
+    WiFly *wifly;
     // must be big enough to hold max one char commands for a given state
     char one_char_cmds[20]; 
     int longest_cmd;
+    bool eat_errors;
     common_cli_ctx *common;
 } cli_ctx;
 
 /* init & entrance */
-cli_ctx *cli_init_cmd(AnySerial *, common_cli_ctx *, WiFlySerial *);
+cli_ctx *cli_init_cmd(AnySerial *, common_cli_ctx *, WiFly *);
 cmd_status cli_proc_cmd(cli_ctx *, char *, size_t);
 
 /* dsc commands */
diff --git a/src/teensy_dsc/defaults.h b/src/teensy_dsc/defaults.h
index 0122d1c..017c274 100644
--- a/src/teensy_dsc/defaults.h
+++ b/src/teensy_dsc/defaults.h
@@ -25,6 +25,7 @@
 #define WIFLY_CHANNEL 1
 #define TX_POWER 1
 #define ENABLE_WPA 0
+#define ENABLE_AP 1
 
 
 /*
@@ -55,6 +56,7 @@ typedef struct {
     uint8_t tx_power; 
     uint8_t rate;
     uint8_t enable_wpa;
+    uint8_t enable_ap;
 } network_settings_t;
 
 typedef enum {
diff --git a/src/teensy_dsc/network.h b/src/teensy_dsc/network.h
new file mode 100644
index 0000000..f8c07f1
--- /dev/null
+++ b/src/teensy_dsc/network.h
@@ -0,0 +1,24 @@
+#ifndef __NETWORK_H__
+#define __NETWORK_H__
+
+#include <Flash.h>
+#include <AnySerial.h>
+#include <WiFly.h>
+#include "defaults.h"
+
+#define PAUSE_DURATION 100
+#define LONG_PAUSE_DURATION 500
+
+#define PORT_OPEN "*port opened*"
+#define PORT_CLOSE "*port closed*"
+#define COMM_SIZE 1420
+#define COMM_TIME_MS 5
+
+void wifi_initial_setup(WiFly *, network_settings_t *);
+void wifi_configure(WiFly *, network_settings_t *);
+void wifi_setup_comms(WiFly *);
+void wifi_setup_network(WiFly *, network_settings_t *);
+void wifi_setup_wireless(WiFly *, network_settings_t *);
+void wifi_get_config(WiFly *, AnySerial *);
+
+#endif
diff --git a/src/teensy_dsc/network.ino b/src/teensy_dsc/network.ino
new file mode 100644
index 0000000..9cebdc4
--- /dev/null
+++ b/src/teensy_dsc/network.ino
@@ -0,0 +1,196 @@
+#include <Arduino.h>
+#include <avr/pgmspace.h>
+#include <AnySerial.h>
+#include "teensy_dsc.h"
+#include "network.h"
+
+/* need to put this in the .cpp so it's only available once */
+FLASH_STRING(wifi_comms_cmds,
+	"set uart mode 0x13\r"
+	"set comm close " PORT_CLOSE "\r"
+	"set comm open " PORT_OPEN "\r"
+	"set comm remote 0\r"
+	"set comm size %d\r"
+	"set comm time %d\r"
+	);
+
+/*
+ * Initialize the WiFly board
+ */
+void 
+wifi_initial_setup(WiFly *wifly, network_settings_t *network) {
+    int ret = false; 
+/*
+    while (! ret) {
+        dbg_serial_printf("getting device status...\n");
+        ret = WiFly->getDeviceStatus();
+        delay(100);
+    }
+
+    // reset to factory defaults
+    dbg_serial_printf("factory RESET...\n");
+    WiFly->uart.print("factory RESET\r");
+    delay(LONG_PAUSE_DURATION);
+    dbg_serial_printf("setup_comms...\n");
+    wifi_setup_comms(WiFly);
+    dbg_serial_printf("setup_wifi...\n");
+    wifi_setup_wireless(WiFly, network);
+    dbg_serial_printf("setup_network...\n");
+    wifi_setup_network(WiFly, network);
+//     WiFly->closeConnection();
+
+    // clear out prior requests.
+    WiFly->flush();
+    dbg_serial_printf("clearing buffer...");
+    while (WiFly->available())
+        serial_printf("%c", WiFly->read());
+    serial_printf("\n");
+    dbg_serial_printf("Done!\n");
+    */
+}
+
+/*
+ * Configure IPv4 Networking
+ */
+void
+wifi_setup_network(WiFly *wifly, network_settings_t *network) {
+    /*
+    dbg_serial_printf("setIP\n");
+    WiFly->setIP(network->ip_address);
+    delay(100);
+    WiFly->setGateway(network->ip_address);
+    delay(100);
+    dbg_serial_printf("netmask\n");
+    WiFly->setNetMask(network->netmask);
+    delay(100);
+    dbg_serial_printf("port\n");
+    WiFly->setLocalPort(network->port);
+    delay(100);
+    dbg_serial_printf("DHCP Mode\n");
+    WiFly->setDHCPMode(4);
+    delay(100);
+    dbg_serial_printf("DNS\n");
+//    WiFly->setProtocol(2);
+    WiFly->setDNS(network->ip_address);
+    */
+}
+
+/*
+ * Configure wireless
+ */
+void
+wifi_setup_wireless(WiFly *wifly, network_settings_t *network) {
+/*
+    char buff[300];
+    char indicator[INDICATOR_BUFFER_SIZE];
+    WiFly->setJoinMode(7);
+    sprintf(buff, "%d", network->channel);
+    WiFly->setChannel(buff);
+    dbg_serial_printf("SSID: %s\n", network->ssid);
+    WiFly->setSSID(network->ssid);
+    sprintf(buff, "set wlan tx %d", network->tx_power);
+    WiFly->SendCommandSimple(buff, indicator);
+
+    WiFly->setAuthMode(network->enable_wpa);
+    if (network->enable_wpa) {
+	WiFly->setPassphrase(network->passphrase);
+    }
+    */
+}
+
+/*
+ * Configure serial comms
+ */
+void
+wifi_setup_comms(WiFly *wifly) {
+    char buff[300];
+    wifi_comms_cmds.copy(buff, 300);
+    wifly->printf(buff,
+	    COMM_SIZE,
+	    COMM_TIME_MS);
+}
+
+void
+wifi_save_settings(WiFly *wifly) {
+    wifly->print("save\r");
+    delay(PAUSE_DURATION);
+    wifly->print("reboot\r");
+    delay(LONG_PAUSE_DURATION);
+}
+
+void
+wifi_get_config(WiFly *wifly, AnySerial *serial) {
+    char c;
+
+    wifly->sendCommand("get everything\r");
+    delay(10);
+    while (wifly->receive((uint8_t *)&c, 1, 300)) {
+        serial->print((char)c);
+    }
+    wifly->dataMode();
+}
+
+void
+wifi_configure(WiFly *wifly, network_settings_t *network) {
+    char buff[30];
+
+
+    sprintf(buff, "set w j %d i\r", network->enable_ap);
+    wifly->sendCommand(buff, "AOK");        // Enable AP mode
+    if (network->enable_ap == 7) {
+        wifly->sendCommand("set i d 4\r", "AOK");        // Enable DHCP server
+        sprintf(buff, "set i a %s\r", network->ip_address);
+        wifly->sendCommand(buff, "AOK"); // Specify IP
+        sprintf(buff, "set i n %s\r", network->netmask);
+        wifly->sendCommand(buff, "AOK"); // Specify netmask
+        sprintf(buff, "set i g %s\r", network->ip_address);
+        wifly->sendCommand(buff, "AOK"); // Specify gateway
+        sprintf(buff, "set d a %s\r", network->ip_address);
+        wifly->sendCommand(buff, "AOK"); // Specify DNS address
+        sprintf(buff, "set w c %d\r", network->channel);
+        wifly->sendCommand(buff, "AOK");        // Specify the channel to create network
+    } else {
+        wifly->sendCommand("set i d 1\r", "AOK");        // Enable DHCP client
+        // in client mode, don't set the channel
+        sprintf(buff, "set w c %d\r", 0);
+        wifly->sendCommand(buff, "AOK");        // Specify the channel to create network
+    }
+
+    sprintf(buff, "set w s %s\r", network->ssid);
+    wifly->sendCommand(buff, "AOK"); // Set network SSID
+
+    wifly->sendCommand("set d name teensydsc\r", "AOK"); // DNS name
+
+    sprintf(buff, "set wlan tx %d\r", network->tx_power);
+    wifly->sendCommand(buff, "AOK"); // Specify transmit power
+
+    sprintf(buff, "set wlan rate %d\r", network->rate);
+    wifly->sendCommand(buff, "AOK");
+
+    if (network->enable_wpa) {
+        wifly->sendCommand("set wlan auth 4\r", "AOK");
+        sprintf("set wlan phrase %s\r", network->passphrase);
+        wifly->sendCommand(buff, "AOK");
+    } else {
+        wifly->sendCommand("set wlan auth 0\r", "AOK");
+    }
+    sprintf(buff, "set i lo %d\r", network->port);
+    wifly->sendCommand(buff, "AOK");  // TCP port
+
+    wifly->sendCommand("set i pr 2\r", "AOK"); // Tcp client/server mode
+
+
+    wifly->sendCommand("set comm remote 0\r", "AOK");
+    wifly->sendCommand("set comm open 0\r", "AOK");
+    wifly->sendCommand("set comm close 0\r", "AOK");
+    sprintf(buff, "set uart baudrate %d\r", WIFLY_SERIAL_SPEED);
+    wifly->sendCommand(buff, "AOK"); 
+
+    // sprintf(buff, "join %s\r", network->ssid, 5000);
+    // wifly->sendCommand(buff, "AOK");
+    wifly->sendCommand("save\r", "Storing", 300);  // save
+    wifly->sendCommand("reboot\r");
+
+    delay(1000);  
+
+}
diff --git a/src/teensy_dsc/teensy_dsc.h b/src/teensy_dsc/teensy_dsc.h
index 2aa8c25..e689386 100644
--- a/src/teensy_dsc/teensy_dsc.h
+++ b/src/teensy_dsc/teensy_dsc.h
@@ -5,8 +5,8 @@
 
 /* WiFly connections */
 #define WIFLY_SERIAL_PORT Serial3
-#define WIFLY_SERIAL_SPEED 115200
-#define WIFLY_DELAY 5000
+#define WIFLY_SERIAL_SPEED 9600
+#define WIFLY_DELAY 3000
 #define WIFLY_RESET 2    // Pin to reset the WiFly
 
 /* Serial port for debugging */
@@ -37,9 +37,10 @@
 #define WIFLY_TIMEOUT 500  // 0.5sec
 #define READBUFF_SIZE 255
 
-#define TEENSY_DSC_VERSION "0.2"
+#define TEENSY_DSC_VERSION "0.3"
 
-/* poll the encoder values every 100ms */
-#define UPDATE_ENCODER_MS 100
+/* poll the encoder values every 50ms */
+#define UPDATE_ENCODER_MS 50 
+#define BLINK_RATE 4
 
 #endif // __TEENSY_DSC_H__
diff --git a/src/teensy_dsc/teensy_dsc.ino b/src/teensy_dsc/teensy_dsc.ino
index 2c90b03..40822d6 100644
--- a/src/teensy_dsc/teensy_dsc.ino
+++ b/src/teensy_dsc/teensy_dsc.ino
@@ -19,20 +19,21 @@
 
 #include <Arduino.h>
 #include <Streaming.h>
-// #define ENCODER_OPTIMIZE_INTERRUPTS
+#define ENCODER_OPTIMIZE_INTERRUPTS
 #include <Encoder.h>
 #include <AnySerial.h>
-#include <WiFlySerial.h>
+#include <WiFly.h>
 #include <Flash.h>
 #include <MsTimer2.h>
 
 #include "defaults.h"
 #include "teensy_dsc.h"
-#include "wifly.h"
+#include "network.h"
 #include "utils.h"
 #include "cli.h"
 #include "defaults.h"
 
+
 /*
  * Init our Encoders & Serial ports
  */
@@ -41,7 +42,7 @@ Encoder EncoderDEC(CHAN_A_DEC, CHAN_B_DEC);
 
 AnySerial UserSerial(&USER_SERIAL_PORT);
 AnySerial WiFlySerialPort(&WIFLY_SERIAL_PORT);
-WiFlySerial WiFly(WiFlySerialPort);
+WiFly _WiFly(WiFlySerialPort);
 
 /* our global contexts */
 cli_ctx *uctx, *wctx;
@@ -51,9 +52,14 @@ common_cli_ctx *common;
 void
 update_encoders() {
 #if DEBUG
-    static int blink = 0;
-    blink = blink ? 0 : 1;
-    digitalWrite(13, blink);
+    static int blink = 1;
+    static int onoff = 0;
+    if (blink == BLINK_RATE) {
+        blink = 1;
+        onoff = onoff ? 0 : 1;
+    }
+    blink += 1;
+    digitalWrite(13, onoff);
 #endif
     common->ra_value = EncoderRA.read();
     common->dec_value = EncoderDEC.read();
@@ -64,9 +70,15 @@ setup() {
     pinMode(WIFLY_RESET, INPUT);
     pinMode(13, OUTPUT); // blink pin
     encoder_settings_t *encoders;
+    float ver;
+
+    pinMode(WIFLY_RESET, INPUT);
+
     common = (common_cli_ctx *)malloc(sizeof(common_cli_ctx));
 
     UserSerial.begin(USER_SERIAL_BAUD);
+    WiFlySerialPort.begin(WIFLY_SERIAL_SPEED);
+
     delay(1000);
 
     // load the encoder settings stored in the EEPROM
@@ -80,18 +92,26 @@ setup() {
     MsTimer2::start();
 
     // Init the USB Serial port & context
-    Serial.printf("Waiting %ums for WiFly...", WIFLY_DELAY);
+    UserSerial.printf("Waiting %ums for WiFly...\n", WIFLY_DELAY);
     // Init the WiFly
     delay(WIFLY_DELAY);   // Wait for it to come up
-    Serial.printf("  OK!\n");
 
-    Serial.printf("Initializing CLI's...");
-    // load the encoder settings stored in the EEPROM
-    WiFly.begin();
+    UserSerial.print("WiFly Version: ");
+    ver = _WiFly.version();
+    UserSerial.println(ver);
+    if (ver < 2.45) {
+        Serial.println("Warning! The WiFly's firmware probably doesn't support AP mode.");
+        Serial.println("Update the WiFly's firmware with wifly_update example");
+    }
+
+    UserSerial.printf("Initializing CLI's...");
     wctx = cli_init_cmd(&WiFlySerialPort, common, NULL);
+    uctx = cli_init_cmd(&UserSerial, common, &_WiFly);
+    UserSerial.printf("  OK!\n");
 
-    uctx = cli_init_cmd(&UserSerial, common, &WiFly);
-    Serial.printf("  OK!\n");
+    // Debug mode
+    WiFlySerialPort.attach_debug(&UserSerial);
+    WiFlySerialPort.debug(0);
 }
 
 void
@@ -100,7 +120,7 @@ loop() {
         process_cmd(uctx);
     }
 
-    if (WiFly.available() > 0) {
+    if (_WiFly.available() > 0) {
         process_cmd(wctx);
     }
 }
@@ -128,7 +148,7 @@ process_cmd(cli_ctx *ctx) {
                 read_buff[0] = byte;
                 read_buff[1] = NULL;
                 status = cli_proc_cmd(ctx, read_buff, 1);
-                serial->read(); // consume the byte
+                serial->read(); // consume the byte 
                 read_buff[0] = NULL;
                 return status;
             }
@@ -172,7 +192,9 @@ process_cmd(cli_ctx *ctx) {
         case E_CMD_NOT_FOUND:
         case E_CMD_BAD_ARGS:
 #ifdef DEBUG
-            serial->printf("ERR [%d]: %s\n", status, read_buff);
+            if (! ctx->eat_errors) {
+                serial->printf("ERR [%d]: %s\n", status, read_buff);
+            }
 #endif
             // fall through
             pos = 0;
@@ -235,3 +257,4 @@ reset_all_settings() {
     encoders.dec_cps = DEC_ENCODER_CPS;
     set_encoder_settings(&encoders);
 }
+
diff --git a/src/teensy_dsc/utils.ino b/src/teensy_dsc/utils.ino
index 9c7691f..fd32fc0 100644
--- a/src/teensy_dsc/utils.ino
+++ b/src/teensy_dsc/utils.ino
@@ -141,12 +141,12 @@ get_word_r(AnySerial *port, uint16_t wait_ms, char *buff) {
 }
 
 char *
-EncoderValue(long value, bool lead) {
+EncoderValue(long value, bool printsign) {
     static char buff[BUFF_LEN];
     char sign;
     unsigned long a_value;
 
-    if (lead) {
+    if (printsign) {
         if (value < 0) {
             sign = '-';
         } else {
@@ -155,7 +155,7 @@ EncoderValue(long value, bool lead) {
     }
 
     a_value = abs(value);
-    if (lead) {
+    if (printsign) {
         sprintf(buff, "%c%05lu", sign, a_value);
     } else {
         sprintf(buff, "%05lu", a_value);
@@ -163,3 +163,14 @@ EncoderValue(long value, bool lead) {
     return buff;
 }
 
+char * 
+HexEncoderValue(long value) {
+  char low, high;
+  static char buff[3];
+
+  high = value / 256;
+  low = value - high * 256;
+  sprintf(buff, "%02x%02x", low, high);
+
+  return buff;
+}
diff --git a/src/teensy_dsc/wifly.h b/src/teensy_dsc/wifly.h
deleted file mode 100644
index 12771ab..0000000
--- a/src/teensy_dsc/wifly.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __WIFLY_H__
-#define __WIFLY_H__
-
-#include <Flash.h>
-#include <WiFlySerial.h>
-#include "defaults.h"
-
-#define PAUSE_DURATION 100
-#define LONG_PAUSE_DURATION 500
-
-#define PORT_OPEN "*port opened*"
-#define PORT_CLOSE "*port closed*"
-#define COMM_SIZE 1420
-#define COMM_TIME_MS 5
-
-void wifi_initial_setup(WiFlySerial *, network_settings_t *);
-void wifi_setup_comms(WiFlySerial *);
-void wifi_setup_network(WiFlySerial *, network_settings_t *);
-void wifi_setup_wireless(WiFlySerial *, network_settings_t *);
-void wifi_get_config(WiFlySerial *, AnySerial *);
-
-#endif
diff --git a/src/teensy_dsc/wifly.ino b/src/teensy_dsc/wifly.ino
deleted file mode 100644
index dcee559..0000000
--- a/src/teensy_dsc/wifly.ino
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <Arduino.h>
-#include <avr/pgmspace.h>
-#include <AnySerial.h>
-#include "teensy_dsc.h"
-#include "wifly.h"
-
-/* need to put this in the .cpp so it's only available once */
-FLASH_STRING(wifi_comms_cmds,
-	"set uart mode 0x13\r"
-	"set comm close " PORT_CLOSE "\r"
-	"set comm open " PORT_OPEN "\r"
-	"set comm remote 0\r"
-	"set comm size %d\r"
-	"set comm time %d\r"
-	);
-
-/*
- * Initialize the WiFly board
- */
-void 
-wifi_initial_setup(WiFlySerial *WiFly, network_settings_t *network) {
-
-    WiFly->getDeviceStatus();
-
-    // reset to factory defaults
-    dbg_serial_printf("factory RESET...");
-    WiFly->uart.print("factory RESET\r");
-    delay(LONG_PAUSE_DURATION);
-    dbg_serial_printf(" complete!\n");
-    wifi_setup_comms(WiFly);
-    wifi_setup_network(WiFly, network);
-    wifi_setup_wireless(WiFly, network);
-//     WiFly->closeConnection();
-
-    // clear out prior requests.
-    WiFly->flush();
-    dbg_serial_printf("clearing buffer...");
-    while (WiFly->available())
-        WiFly->read();
-    dbg_serial_printf("Done!\n");
-}
-
-/*
- * Configure IPv4 Networking
- */
-void
-wifi_setup_network(WiFlySerial *WiFly, network_settings_t *network) {
-    WiFly->setIP(network->ip_address);
-    WiFly->setGateway(network->ip_address);
-    WiFly->setNetMask(network->netmask);
-    WiFly->setLocalPort(network->port);
-    WiFly->setDHCPMode(4);
-    WiFly->setProtocol(2);
-    WiFly->setDNS(network->ip_address);
-}
-
-/*
- * Configure wireless
- */
-void
-wifi_setup_wireless(WiFlySerial *WiFly, network_settings_t *network) {
-    char buff[300];
-    char indicator[INDICATOR_BUFFER_SIZE];
-
-    WiFly->setSSID(network->ssid);
-    sprintf(buff, "%d", network->channel);
-    WiFly->setChannel(buff);
-    WiFly->setJoinMode(7);
-    sprintf(buff, "set wlan tx %d", network->tx_power);
-    WiFly->SendCommandSimple(buff, indicator);
-
-    if (network->enable_wpa) {
-	WiFly->setPassphrase(network->passphrase);
-	WiFly->setAuthMode(network->enable_wpa);
-    }
-}
-
-/*
- * Configure serial comms
- */
-void
-wifi_setup_comms(WiFlySerial *WiFly) {
-    char buff[300];
-    wifi_comms_cmds.copy(buff, 300);
-    WiFly->printf(buff,
-	    COMM_SIZE,
-	    COMM_TIME_MS);
-}
-
-void
-wifi_save_settings(WiFlySerial *WiFly) {
-    WiFly->print("save\r");
-    delay(PAUSE_DURATION);
-    WiFly->print("reboot\r");
-    delay(LONG_PAUSE_DURATION);
-}
-
-#define REQUEST_BUFFER_SIZE 120
-void
-wifi_get_config(WiFlySerial *WiFly, AnySerial *serial) {
-    char bufRequest[REQUEST_BUFFER_SIZE];
-
-    WiFly->getIP(bufRequest, REQUEST_BUFFER_SIZE);
-    *serial << F("IP: ") << bufRequest << endl;
-    WiFly->getNetMask(bufRequest, REQUEST_BUFFER_SIZE);
-    *serial << F("Netmask: ") << bufRequest << endl;
-    WiFly->getSSID(bufRequest, REQUEST_BUFFER_SIZE);
-    *serial << F("SSID: ") << bufRequest << endl;
-}