diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d68f79d..e45da621 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
+- Added blocking for shifts above or below min/max setpoints.
+- Added Peloton serial decoder to sensor factory.
 - Added blocking for shifts above or below min/max set points.
+- Added power scaler for new board.
+- Added Main Index link to develop.html.
 
 ### Changed
 - PowerTable values are now adjusted to 90 RPM cad on input.
 - PowerTable entries are now validated against previous entries. 
 - Changes to default settings for better ride-ability.  raised incline multiplier and erg sensitivity, increased incline multiplier and max brake watts.
 - Fixed a bug in the new cadence compensation where an int should have been a float. 
+- Moved serial checking to own function. 
+- Reduced verbosity of ERG logging.
 
 ### Hardware
 - removed duplicate directory in direct mount folder
diff --git a/data/develop.html b/data/develop.html
index 2dddfae2..6fe06ccc 100644
--- a/data/develop.html
+++ b/data/develop.html
@@ -3,24 +3,28 @@
 
 <head>
   <style type="text/css">
-html {
-  background-color: #03245c;
-} 
-    </style>
+    html {
+      background-color: #03245c;
+    }
+  </style>
 
   <title>SmartSpin2K Web Server</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
-<fieldset><legend><a href="http://github.com/doudar/SmartSpin2k">http://github.com/doudar/SmartSpin2k</a></legend>
-<body>
-  <h1 style="text-align: center;"><strong>Developer Tools</strong></h1>
-  <h2>
-    <p style="text-align: center;"><strong><a href="streamfit.html">Replay Fit File Over BLE</a></strong></p>
-    <p style="text-align: center;"><strong><a href="btsimulator.html">Manual BLE Simulator</a></strong></p>
-    <p style="text-align: center;"><strong><a href="status.html">SmartSpin Debugging Info</a></strong></p>
-    <p style="text-align: center;"><strong><a href="login">Update Firmware</a></strong></p>
-    <p><a href=https://github.com/doudar/SmartSpin2k/wiki>SS2K Help</a></p>
-  </h2>
+<fieldset>
+  <legend><a href="http://github.com/doudar/SmartSpin2k">http://github.com/doudar/SmartSpin2k</a></legend>
+
+  <body>
+    <p style="text-align: left;"><strong><a href="index.html">Main Index</a></strong></p>
+    <h1>
+      <h1 style="text-align: center;"><strong>Developer Tools</strong></h1>
+      <h2>
+        <p style="text-align: center;"><strong><a href="streamfit.html">Replay Fit File Over BLE</a></strong></p>
+        <p style="text-align: center;"><strong><a href="btsimulator.html">Manual BLE Simulator</a></strong></p>
+        <p style="text-align: center;"><strong><a href="status.html">SmartSpin Debugging Info</a></strong></p>
+        <p style="text-align: center;"><strong><a href="login">Update Firmware</a></strong></p>
+        <p><a href=https://github.com/doudar/SmartSpin2k/wiki>SS2K Help</a></p>
+      </h2>
 </fieldset>
 
 <script>
diff --git a/include/Main.h b/include/Main.h
index 10b01d06..4c171b50 100644
--- a/include/Main.h
+++ b/include/Main.h
@@ -13,6 +13,7 @@
 #include "BLE_Common.h"
 #include "LittleFS_Upgrade.h"
 #include "boards.h"
+#include "SensorCollector.h"
 
 #define MAIN_LOG_TAG "Main"
 
@@ -49,19 +50,33 @@ class SS2K {
   void updateStealthchop();
   void checkDriverTemperature();
   void motorStop(bool releaseTension = false);
+  void checkSerial();
 
   SS2K() {
-    targetPosition         = 0;
-    currentPosition        = 0;
-    stepperIsRunning       = false;
-    externalControl        = false;
-    syncMode               = false;
-    lastDebounceTime       = 0;
-    debounceDelay          = DEBOUNCE_DELAY;
-    lastShifterPosition    = 0;
-    shiftersHoldForScan    = SHIFTERS_HOLD_FOR_SCAN;
-    scanDelayTime          = 10000;
-    scanDelayStart         = 0;
+    targetPosition      = 0;
+    currentPosition     = 0;
+    stepperIsRunning    = false;
+    externalControl     = false;
+    syncMode            = false;
+    lastDebounceTime    = 0;
+    debounceDelay       = DEBOUNCE_DELAY;
+    lastShifterPosition = 0;
+    shiftersHoldForScan = SHIFTERS_HOLD_FOR_SCAN;
+    scanDelayTime       = 10000;
+    scanDelayStart      = 0;
+  }
+};
+
+class AuxSerialBuffer {
+ public:
+  uint8_t data[20];
+  size_t len;
+
+  AuxSerialBuffer() {
+    for (int i = 0; i < AUX_BUF_SIZE; i++) {
+      this->data[i] = 0;
+    }
+    this->len = 0;
   }
 };
 
@@ -72,4 +87,10 @@ extern SS2K ss2k;
 
 // Main program variable that stores most everything
 extern userParameters userConfig;
-extern RuntimeParameters rtConfig;
\ No newline at end of file
+extern RuntimeParameters rtConfig;
+
+//Peloton Specific Parameters
+#define PELOTON_RQ_SIZE 4
+const uint8_t peloton_rq_watts[]{0xF5, 0x44, 0x39, 0xF6};
+const uint8_t peloton_rq_cad[]{0xF5, 0x41, 0x36, 0xF6};
+const uint8_t peloton_rq_res[]{0xF5, 0x4A, 0x3F, 0xF6};
\ No newline at end of file
diff --git a/include/SensorCollector.h b/include/SensorCollector.h
new file mode 100644
index 00000000..027d53a2
--- /dev/null
+++ b/include/SensorCollector.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2020  Anthony Doud & Joel Baranick
+ * All rights reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
+#include <NimBLEDevice.h>
+#include <Arduino.h>
+#include <Main.h>
+
+#pragma once
+
+
+void collectAndSet(NimBLEUUID charUUID, NimBLEUUID serviceUUID, NimBLEAddress address, uint8_t *pData, size_t length);
\ No newline at end of file
diff --git a/include/boards.h b/include/boards.h
index 51b196bf..4ce4f086 100644
--- a/include/boards.h
+++ b/include/boards.h
@@ -27,6 +27,7 @@ class Board {
   int stepperSerialRxPin;
   int auxSerialTxPin;
   int auxSerialRxPin;
+  int pwrScaler;
 };
 
 class Boards {
@@ -47,6 +48,7 @@ class Boards {
     rev1.stepperSerialRxPin = r1_STEPPERSERIAL_RX;
     rev1.auxSerialTxPin     = 0;
     rev1.auxSerialRxPin     = 0;
+    rev1.pwrScaler          = r1_PWR_SCALER;
     // Rev 2
     rev2.name               = r2_NAME;
     rev2.versionVoltage     = r2_VERSION_VOLTAGE;
@@ -59,5 +61,6 @@ class Boards {
     rev2.stepperSerialRxPin = r2_STEPPERSERIAL_RX;
     rev2.auxSerialTxPin     = r2_AUX_SERIAL_TX;
     rev2.auxSerialRxPin     = r2_AUX_SERIAL_RX;
+    rev2.pwrScaler          = r2_PWR_SCALER;
   }
 };
\ No newline at end of file
diff --git a/include/settings.h b/include/settings.h
index 06eb1864..9353e080 100644
--- a/include/settings.h
+++ b/include/settings.h
@@ -122,6 +122,9 @@
 
 // TMC2208/TMC2224 SoftwareSerial transmit pin
 #define r1_STEPPERSERIAL_TX 12
+
+// Reduce current setting by this divisor (0-31)
+#define r1_PWR_SCALER 31
 ////////////////////////////////////////////////////////
 //////////// Defines for hardware Revision 2 ////////////
 
@@ -153,10 +156,13 @@
 #define r2_STEPPERSERIAL_TX 19
 
 // TMC2209 SoftwareSerial receive pin
-#define r2_AUX_SERIAL_RX 21
+#define r2_AUX_SERIAL_RX 22
 
 // TMC2209 SoftwareSerial transmit pin
-#define r2_AUX_SERIAL_TX 22
+#define r2_AUX_SERIAL_TX 21
+
+// Reduce current setting by this divisor (0-31)
+#define r2_PWR_SCALER 12
 ////////////////////////////////////////////////////////
 
 // TMC2208/TMC2224 HardwareSerial port
@@ -165,9 +171,6 @@
 // Match to your driver
 #define R_SENSE 0.11f
 
-// Maximum scaling of the driver output power 0-31
-#define DRIVER_MAX_PWR_SCALER 31
-
 // Hardware pin for indicator LED *note* internal LED on esp32 Dev board is pin
 // 2
 #define LED_PIN 2
@@ -233,6 +236,15 @@
 // Temperature of the ESP32 at which to start reducing the power output of the stepper motor driver.
 #define THROTTLE_TEMP 85
 
+// Size of the Aux Serial Buffer for Peloton
+#define AUX_BUF_SIZE 20
+
+// Interrogate Peloton bike for data?
+#define PELOTON_TX true
+
+// If not receiving Peleton Messages, how long to wait before next TX attempt is
+#define TX_CHECK_INTERVAL 20
+
 // Uncomment to enable sending Telegram debug messages back to the chat
 // specified in telegram_token.h
 // #define USE_TELEGRAM
diff --git a/lib/SS2K/include/Constants.h b/lib/SS2K/include/Constants.h
index c8b45714..e2cc3d1a 100644
--- a/lib/SS2K/include/Constants.h
+++ b/lib/SS2K/include/Constants.h
@@ -47,3 +47,13 @@
 #define ECHELON_SERVICE_UUID NimBLEUUID("0bf669f1-45f2-11e7-9598-0800200c9a66")
 #define ECHELON_WRITE_UUID   NimBLEUUID("0bf669f2-45f2-11e7-9598-0800200c9a66")
 #define ECHELON_DATA_UUID    NimBLEUUID("0bf669f4-45f2-11e7-9598-0800200c9a66")
+
+// Dummy UUID for Peloton Serial Data Interface
+#define PELOTON_DATA_UUID NimBLEUUID("00000000-0000-0000-0000-0000000000321")
+#define PELOTON_ADDRESS   NimBLEAddress("00:00:00:00:00:00:00")
+// peloton Serial
+#define HEADER 0xF1
+#define FOOTER 0xF6
+#define CAD_ID 0x41
+#define RES_ID 0x4A
+#define POW_ID 0x44
diff --git a/lib/SS2K/include/sensors/PelotonData.h b/lib/SS2K/include/sensors/PelotonData.h
new file mode 100644
index 00000000..311bb057
--- /dev/null
+++ b/lib/SS2K/include/sensors/PelotonData.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2020  Anthony Doud & Joel Baranick
+ * All rights reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
+
+#pragma once
+
+#include "SensorData.h"
+
+class PelotonData : public SensorData {
+ public:
+  PelotonData() : SensorData("PTON") {}
+
+  bool hasHeartRate();
+  bool hasCadence();
+  bool hasPower();
+  bool hasSpeed();
+  int getHeartRate();
+  float getCadence();
+  int getPower();
+  float getSpeed();
+  void decode(uint8_t *data, size_t length);
+
+ private:
+  bool hasData  = false;
+  float cadence = nanf("");
+  int power     = INT_MIN;
+};
\ No newline at end of file
diff --git a/lib/SS2K/src/sensors/PelotonData.cpp b/lib/SS2K/src/sensors/PelotonData.cpp
new file mode 100644
index 00000000..5a8e2adf
--- /dev/null
+++ b/lib/SS2K/src/sensors/PelotonData.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2020  Anthony Doud & Joel Baranick
+ * All rights reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
+
+#include "endian.h"
+#include "sensors/PelotonData.h"
+#include "Constants.h"
+
+bool PelotonData::hasHeartRate() { return false; }
+
+bool PelotonData::hasCadence() { return this->hasData; }
+
+bool PelotonData::hasPower() { return this->hasData; }
+
+bool PelotonData::hasSpeed() { return false; }
+
+int PelotonData::getHeartRate() { return INT_MIN; }
+
+float PelotonData::getCadence() { return this->cadence; }
+
+int PelotonData::getPower() { return this->power; }
+
+float PelotonData::getSpeed() { return nanf(""); }
+
+void PelotonData::decode(uint8_t *data, size_t length) {
+  float value                  = 0.0;
+  const uint8_t payload_length = data[2];
+  for (uint8_t i = 2 + payload_length; i > 2; i--) {
+    // -30 = Convert from ASCII to numeric
+    uint8_t next_digit = data[i] - 0x30;
+    // Check for overflow
+    if (value > 6553 || (value == 6553 && next_digit > 5)) {
+      return;
+    }
+    value = value * 10 + next_digit;
+  }
+  hasData = true;
+  switch (data[1]) {
+    case POW_ID:
+      if (value >= 0) {
+        power = value / 10;
+      } else {
+        power = 0;
+      }
+
+      break;
+
+    case CAD_ID:
+      cadence = value;
+      break;
+
+    case RES_ID:
+      // we don't use resistance
+      break;
+
+    default:
+      break;
+      //   cadence = nanf("");
+      //   power   = INT_MIN;
+      //   hasData = false;
+  }
+}
\ No newline at end of file
diff --git a/lib/SS2K/src/sensors/SensorDataFactory.cpp b/lib/SS2K/src/sensors/SensorDataFactory.cpp
index dc329c9e..c93f57f6 100644
--- a/lib/SS2K/src/sensors/SensorDataFactory.cpp
+++ b/lib/SS2K/src/sensors/SensorDataFactory.cpp
@@ -13,6 +13,7 @@
 #include "sensors/FitnessMachineIndoorBikeData.h"
 #include "sensors/HeartRateData.h"
 #include "sensors/EchelonData.h"
+#include "sensors/PelotonData.h"
 
 std::shared_ptr<SensorData> SensorDataFactory::getSensorData(const NimBLEUUID characteristicUUID, const uint64_t peerAddress, uint8_t *data, size_t length) {
   for (auto &it : SensorDataFactory::knownDevices) {
@@ -32,6 +33,8 @@ std::shared_ptr<SensorData> SensorDataFactory::getSensorData(const NimBLEUUID ch
     sensorData = std::shared_ptr<SensorData>(new FlywheelData());
   } else if (characteristicUUID == ECHELON_DATA_UUID) {
     sensorData = std::shared_ptr<SensorData>(new EchelonData());
+  } else if (characteristicUUID == PELOTON_DATA_UUID) {
+    sensorData = std::shared_ptr<SensorData>(new PelotonData());
   } else {
     return NULL_SENSOR_DATA;
   }
diff --git a/src/BLE_Common.cpp b/src/BLE_Common.cpp
index ecde0ee2..f440436b 100644
--- a/src/BLE_Common.cpp
+++ b/src/BLE_Common.cpp
@@ -16,7 +16,6 @@
 bool hr2p = false;
 
 TaskHandle_t BLECommunicationTask;
-SensorDataFactory sensorDataFactory;
 
 void BLECommunications(void *pvParameters) {
   for (;;) {
@@ -54,45 +53,8 @@ void BLECommunications(void *pvParameters) {
                   for (size_t i = 0; i < length; i++) {
                     pData[i] = incomingNotifyData.data[i];
                   }
+                  collectAndSet(pRemoteBLECharacteristic->getUUID(), myAdvertisedDevice.serviceUUID, pRemoteBLECharacteristic->getRemoteService()->getClient()->getPeerAddress(), pData, length);
 
-                  const int kLogBufMaxLength = 250;
-                  char logBuf[kLogBufMaxLength];
-                  SS2K_LOGD(BLE_COMMON_LOG_TAG, "Data length: %d", length);
-                  int logBufLength = ss2k_log_hex_to_buffer(pData, length, logBuf, 0, kLogBufMaxLength);
-
-                  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, "<- %.8s | %.8s", myAdvertisedDevice.serviceUUID.toString().c_str(),
-                                           myAdvertisedDevice.charUUID.toString().c_str());
-
-                  std::shared_ptr<SensorData> sensorData = sensorDataFactory.getSensorData(
-                      pRemoteBLECharacteristic->getUUID(), (uint64_t)pRemoteBLECharacteristic->getRemoteService()->getClient()->getPeerAddress(), pData, length);
-
-                  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " | %s[", sensorData->getId().c_str());
-                  if (sensorData->hasHeartRate() && !rtConfig.getSimulateHr()) {
-                    int heartRate = sensorData->getHeartRate();
-                    rtConfig.setSimulatedHr(heartRate);
-                    spinBLEClient.connectedHR |= true;
-                    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " HR(%d)", heartRate % 1000);
-                  }
-                  if (sensorData->hasCadence() && !rtConfig.getSimulateCad()) {
-                    float cadence = sensorData->getCadence();
-                    rtConfig.setSimulatedCad(cadence);
-                    spinBLEClient.connectedCD |= true;
-                    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " CD(%.2f)", fmodf(cadence, 1000.0));
-                  }
-                  if (sensorData->hasPower() && !rtConfig.getSimulateWatts()) {
-                    int power = sensorData->getPower() * userConfig.getPowerCorrectionFactor();
-                    rtConfig.setSimulatedWatts(power);
-                    spinBLEClient.connectedPM |= true;
-                    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " PW(%d)", power % 10000);
-                  }
-                  if (sensorData->hasSpeed()) {
-                    float speed = sensorData->getSpeed();
-                    rtConfig.setSimulatedSpeed(speed);
-                    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " SD(%.2f)", fmodf(speed, 1000.0));
-                  }
-                  strncat(logBuf + logBufLength, " ]", kLogBufMaxLength - logBufLength);
-                  SS2K_LOG(BLE_COMMON_LOG_TAG, "%s", logBuf);
-                  SEND_TO_TELEGRAM(String(logBuf));
                 }
               } else if (!pClient->isConnected()) {  // This shouldn't ever be
                                                      // called...
diff --git a/src/ERG_Mode.cpp b/src/ERG_Mode.cpp
index 5d04751a..f779fb2c 100644
--- a/src/ERG_Mode.cpp
+++ b/src/ERG_Mode.cpp
@@ -30,7 +30,7 @@ void setupERG() {
 }
 
 void ergTaskLoop(void* pvParameters) {
-  ErgMode ergMode = ErgMode(&powerTable);   
+  ErgMode ergMode = ErgMode(&powerTable);
   PowerBuffer powerBuffer;
 
   ergMode._writeLogHeader();
@@ -143,7 +143,7 @@ void PowerTable::setStepperMinMax() {
 
 // Accepts new data into the table and averages input by number of readings in the power entry.
 void PowerTable::newEntry(PowerBuffer& powerBuffer) {
-  float watts              = 0;
+  float watts            = 0;
   int cad                = 0;
   int32_t targetPosition = 0;
 
@@ -163,14 +163,14 @@ void PowerTable::newEntry(PowerBuffer& powerBuffer) {
       cad            = powerBuffer.powerEntry[i].cad;
       continue;
     }
-
+    SS2K_LOGW(POWERTABLE_LOG_TAG, "Buf[%d](%dw)(%dpos)(%dcad)", i, powerBuffer.powerEntry[i].watts, powerBuffer.powerEntry[i].targetPosition, powerBuffer.powerEntry[i].cad);
     // calculate average
-    watts          = (watts + powerBuffer.powerEntry[i].watts) / 2.0;
-    targetPosition = (targetPosition + powerBuffer.powerEntry[i].targetPosition) / 2.0;
-    cad            = (cad + powerBuffer.powerEntry[i].cad) / 2.0;
+    watts          = (watts + powerBuffer.powerEntry[i].watts) / 2;
+    targetPosition = (targetPosition + powerBuffer.powerEntry[i].targetPosition) / 2;
+    cad            = (cad + powerBuffer.powerEntry[i].cad) / 2;
   }
+  SS2K_LOG(POWERTABLE_LOG_TAG, "Avg:(%dw)(%dpos)(%dcad)", (int)watts, targetPosition, cad);
   // Done with powerBuffer
-
   // To start working on the PowerTable, we need to calculate position in the table for the new entry
   int i = round(watts / POWERTABLE_INCREMENT);
 
@@ -178,7 +178,8 @@ void PowerTable::newEntry(PowerBuffer& powerBuffer) {
   if (i > 0) {
     for (int j = i - 1; j > 0; j--) {
       if ((this->powerEntry[j].targetPosition != 0) && (this->powerEntry[j].targetPosition >= targetPosition)) {
-        SS2K_LOG(POWERTABLE_LOG_TAG, "Target Slot (%dw)(%d)(%d) was less than previous (%d)(%d)", watts, i, targetPosition, j, this->powerEntry[j].targetPosition);
+        SS2K_LOG(POWERTABLE_LOG_TAG, "Target Slot (%dw)(%d)(%d) was less than previous (%d)(%d)", (int)watts, i, targetPosition, j, this->powerEntry[j].targetPosition);
+        this->powerEntry[j].readings = 1;  // Make previous slot easier to round/faster to change.
         return;
       }
     }
@@ -187,7 +188,8 @@ void PowerTable::newEntry(PowerBuffer& powerBuffer) {
   if (i < POWERTABLE_SIZE) {
     for (int j = i + 1; j < POWERTABLE_SIZE; j++) {
       if ((this->powerEntry[j].targetPosition != 0) && (targetPosition >= this->powerEntry[j].targetPosition)) {
-        SS2K_LOG(POWERTABLE_LOG_TAG, "Target Slot (%dw)(%d)(%d) was greater than next (%d)(%d)", watts, i, targetPosition, j, this->powerEntry[j].targetPosition);
+        SS2K_LOG(POWERTABLE_LOG_TAG, "Target Slot (%dw)(%d)(%d) was greater than next (%d)(%d)", (int)watts, i, targetPosition, j, this->powerEntry[j].targetPosition);
+        this->powerEntry[j].readings = 1;  // Make next slot easier to round/faster to change.
         return;
       }
     }
@@ -324,7 +326,7 @@ int32_t PowerTable::lookup(int watts, int cad) {
 
 int PowerTable::_adjustWattsForCadence(int watts, float cad) {
   if (cad > 0) {
-    watts = (watts * (((NORMAL_CAD / cad)+1)/2));
+    watts = (watts * (((NORMAL_CAD / cad) + 1) / 2));
     return watts;
   } else {
     return 0;
@@ -361,12 +363,15 @@ void PowerTable::toLog() {
   }
   SS2K_LOG(POWERTABLE_LOG_TAG, "%s|", oString.c_str());
   oString = "";
-  for (int i = 0; i < POWERTABLE_SIZE; i++) {
-    sprintf(buffer, oFormat, this->powerEntry[i].cad);
-    oString += buffer;
-  }
-  SS2K_LOG(POWERTABLE_LOG_TAG, "%s|", oString.c_str());
-  oString = "";
+
+  // Currently not using CAD in the Power Table.
+  // for (int i = 0; i < POWERTABLE_SIZE; i++) {
+  //  sprintf(buffer, oFormat, this->powerEntry[i].cad);
+  //  oString += buffer;
+  //}
+  // SS2K_LOG(POWERTABLE_LOG_TAG, "%s|", oString.c_str());
+  // oString = "";
+
   for (int i = 0; i < POWERTABLE_SIZE; i++) {
     sprintf(buffer, oFormat, this->powerEntry[i].targetPosition);
     oString += buffer;
@@ -383,7 +388,7 @@ void ErgMode::computErg() {
 
   // check for new power value or new setpoint, if watts < 10 treat as faulty
   if ((this->watts.timestamp == newWatts.timestamp && this->setPoint == newSetPoint) || newWatts.value < 10) {
-    SS2K_LOG(ERG_MODE_LOG_TAG, "Watts were old.");
+    SS2K_LOGW(ERG_MODE_LOG_TAG, "Watts were old.");
     return;
   }
 
@@ -402,7 +407,6 @@ void ErgMode::computErg() {
   // SetPoint changed
   if (this->setPoint != newSetPoint) {
     _setPointChangeState(newSetPoint, newCadence, newWatts, currentIncline);
-    SS2K_LOG(ERG_MODE_LOG_TAG, "SetPoint changed: %dw", newSetPoint);
     return;
   }
 
@@ -420,7 +424,7 @@ void ErgMode::_setPointChangeState(int newSetPoint, int newCadence, Measurement&
     tableResult     = currentIncline + (wattChange * factor);
   }
 
-  SS2K_LOG(ERG_MODE_LOG_TAG, "Using PowerTable Result %d", tableResult);
+  SS2K_LOG(ERG_MODE_LOG_TAG, "SetPoint changed:%dw PowerTable Result: %d", newSetPoint, tableResult);
   _updateValues(newSetPoint, newCadence, newWatts, currentIncline, tableResult);
 
   int i = 0;
@@ -478,11 +482,11 @@ bool ErgMode::_userIsSpinning(int cadence, float incline) {
 }
 
 void ErgMode::_writeLogHeader() {
-  SS2K_LOG(ERG_MODE_LOG_CSV_TAG, "cycles;current incline;new incline;current setpoint;new setpoint;current watts;new watts;current cadence;new cadence;");
+  SS2K_LOGW(ERG_MODE_LOG_CSV_TAG, "cycles;current incline;new incline;current setpoint;new setpoint;current watts;new watts;current cadence;new cadence;");
 }
 
 void ErgMode::_writeLog(int cycles, float currentIncline, float newIncline, int currentSetPoint, int newSetPoint, int currentWatts, int newWatts, int currentCadence,
                         int newCadence) {
-  SS2K_LOG(ERG_MODE_LOG_CSV_TAG, "%d;%.2f;%.2f;%d;%d;%d;%d;%d;%d", cycles, currentIncline, newIncline, currentSetPoint, newSetPoint, currentWatts, newWatts, currentCadence,
-           newCadence);
+  SS2K_LOGW(ERG_MODE_LOG_CSV_TAG, "%d;%.2f;%.2f;%d;%d;%d;%d;%d;%d", cycles, currentIncline, newIncline, currentSetPoint, newSetPoint, currentWatts, newWatts, currentCadence,
+            newCadence);
 }
diff --git a/src/Main.cpp b/src/Main.cpp
index 3384efd6..bfe9cb5b 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -15,10 +15,17 @@
 #include "ERG_Mode.h"
 #include "UdpAppender.h"
 #include "WebsocketAppender.h"
+#include <Constants.h>
 
-HardwareSerial stepperSerial(2);
+// Stepper Motor Serial
+HardwareSerial stepperSerial(1);
 TMC2208Stepper driver(&SERIAL_PORT, R_SENSE);  // Hardware Serial
 
+// Peloton Serial
+HardwareSerial auxSerial(2);
+AuxSerialBuffer auxSerialBuffer;
+// should we interrogate the bike for cadence and power?
+
 FastAccelStepperEngine engine = FastAccelStepperEngine();
 FastAccelStepper *stepper     = NULL;
 // Setup a task so the stepper will run on a different core than the main code
@@ -75,8 +82,19 @@ void setup() {
   }
   SS2K_LOG(MAIN_LOG_TAG, "Current Board Revision is: %s", currentBoard.name);
 
-  stepperSerial.begin(57600, SERIAL_8N2, currentBoard.stepperSerialRxPin, currentBoard.stepperSerialTxPin);
+  // initialize Stepper serial port
 
+  stepperSerial.begin(57600, SERIAL_8N2, currentBoard.stepperSerialRxPin, currentBoard.stepperSerialTxPin);
+  // initialize aux serial port
+  if (currentBoard.auxSerialTxPin) {
+    auxSerial.setTxBufferSize(500);
+    auxSerial.setRxBufferSize(500);
+    auxSerial.begin(19200, SERIAL_8N1, currentBoard.auxSerialRxPin, currentBoard.auxSerialTxPin, false);
+    if (!auxSerial) {
+      SS2K_LOG(MAIN_LOG_TAG, "Invalid Serial Pin Configuration");
+    }
+    // auxSerial.onReceive(auxSerialRX, true);  // setup callback
+  }
   // Initialize LittleFS
   SS2K_LOG(MAIN_LOG_TAG, "Mounting Filesystem");
   if (!LittleFS.begin(false)) {
@@ -143,7 +161,7 @@ void setup() {
 
   ss2k.resetIfShiftersHeld();
   SS2K_LOG(MAIN_LOG_TAG, "Creating Shifter Interrupts");
-  // Setup Interrups so shifters work anytime
+  // Setup Interrupts so shifters work anytime
   attachInterrupt(digitalPinToInterrupt(currentBoard.shiftUpPin), ss2k.shiftUp, CHANGE);
   attachInterrupt(digitalPinToInterrupt(currentBoard.shiftDownPin), ss2k.shiftDown, CHANGE);
   digitalWrite(LED_PIN, HIGH);
@@ -219,9 +237,15 @@ void SS2K::maintenanceLoop(void *pvParameters) {
 #endif  // DEBUG_STACK
       loopCounter = 0;
     }
+
+    // Monitor serial port for data
+    if (currentBoard.auxSerialTxPin) {
+      ss2k.checkSerial();
+    }
     loopCounter++;
   }
 }
+
 #endif  // UNIT_TEST
 
 void SS2K::restartWifi() {
@@ -373,20 +397,13 @@ void SS2K::setupTMCStepperDriver() {
   driver.pdn_disable(true);
   driver.mstep_reg_select(true);
 
-  uint16_t msread = driver.microsteps();
-  SS2K_LOG(MAIN_LOG_TAG, " read:ms=%ud", msread);
-
-  driver.rms_current(userConfig.getStepperPower());  // Set motor RMS current
-  driver.microsteps(4);                              // Set microsteps to 1/8th
-  driver.irun(DRIVER_MAX_PWR_SCALER);
-  driver.ihold((uint8_t)(DRIVER_MAX_PWR_SCALER * .65));  // hold current % 0-DRIVER_MAX_PWR_SCALER
+  ss2k.updateStepperPower();
+  driver.microsteps(4);  // Set microsteps to 1/8th
+  driver.irun(currentBoard.pwrScaler);
+  driver.ihold((uint8_t)(currentBoard.pwrScaler * .5));  // hold current % 0-DRIVER_MAX_PWR_SCALER
   driver.iholddelay(10);                                 // Controls the number of clock cycles for motor
                                                          // power down after standstill is detected
   driver.TPOWERDOWN(128);
-  msread               = driver.microsteps();
-  uint16_t currentread = driver.cs_actual();
-  SS2K_LOG(MAIN_LOG_TAG, " read:current=%ud", currentread);
-  SS2K_LOG(MAIN_LOG_TAG, " read:ms=%ud", msread);
 
   driver.toff(5);
   bool t_bool = userConfig.getStealthchop();
@@ -397,8 +414,10 @@ void SS2K::setupTMCStepperDriver() {
 
 // Applies current power to driver
 void SS2K::updateStepperPower() {
-  SS2K_LOG(MAIN_LOG_TAG, "Stepper power is now %d", userConfig.getStepperPower());
-  driver.rms_current(userConfig.getStepperPower());
+  uint16_t rmsPwr = (userConfig.getStepperPower());
+  driver.rms_current(rmsPwr);
+  uint16_t current = driver.cs_actual();
+  SS2K_LOG(MAIN_LOG_TAG, "Stepper power is now %d.  read:cs=%U", userConfig.getStepperPower(), current);
 }
 
 // Applies current Stealthchop to driver
@@ -414,14 +433,14 @@ void SS2K::updateStealthchop() {
 void SS2K::checkDriverTemperature() {
   static bool overTemp = false;
   if (static_cast<int>(temperatureRead()) > THROTTLE_TEMP) {  // Start throttling driver power at 72C on the ESP32
-    uint8_t throttledPower = (THROTTLE_TEMP - static_cast<int>(temperatureRead())) + DRIVER_MAX_PWR_SCALER;
+    uint8_t throttledPower = (THROTTLE_TEMP - static_cast<int>(temperatureRead())) + currentBoard.pwrScaler;
     driver.irun(throttledPower);
     SS2K_LOG(MAIN_LOG_TAG, "Over temp! Driver is throttling down! ESP32 @ %f C", temperatureRead());
     overTemp = true;
-  } else if ((driver.cs_actual() < DRIVER_MAX_PWR_SCALER) && !driver.stst()) {
+  } else if (static_cast<int>(temperatureRead()) < THROTTLE_TEMP) {
     if (overTemp) {
       SS2K_LOG(MAIN_LOG_TAG, "Temperature is now under control. Driver current reset.");
-      driver.irun(DRIVER_MAX_PWR_SCALER);
+      driver.irun(currentBoard.pwrScaler);
     }
     overTemp = false;
   }
@@ -434,3 +453,48 @@ void SS2K::motorStop(bool releaseTension) {
     stepper->moveTo(ss2k.targetPosition - userConfig.getShiftStep() * 4);
   }
 }
+
+void SS2K::checkSerial() {
+  static int txCheck = TX_CHECK_INTERVAL;
+  if (auxSerial.available() >= 8) {  // if at least 8 bytes are available to read from the serial port
+    txCheck             = TX_CHECK_INTERVAL;
+    int i               = 0;
+    int k               = 0;
+    auxSerialBuffer.len = auxSerial.readBytes(auxSerialBuffer.data, AUX_BUF_SIZE);
+    // pre-process Peloton Data. If we get more serial devices we will have to move this into sensor data factory.
+    // This is done here to prevent a lot of extra logging.
+    for (i = 0; i < auxSerialBuffer.len; i++) {  // Find start of data string
+      if (auxSerialBuffer.data[i] == HEADER) {
+        for (k = i; k < auxSerialBuffer.len; k++) {  // Find end of data string
+          if (auxSerialBuffer.data[k] == FOOTER) {
+            k++;
+            break;
+          }
+        }
+        size_t newLen = k - i;  // find length of sub data
+        uint8_t newBuf[newLen];
+        for (int j = i; j < k; j++) {
+          newBuf[j - i] = auxSerialBuffer.data[j];
+        }
+        collectAndSet(PELOTON_DATA_UUID, PELOTON_DATA_UUID, PELOTON_ADDRESS, newBuf, newLen);
+        break;
+      }
+    }
+  }
+  if (PELOTON_TX && (txCheck >= TX_CHECK_INTERVAL)) {
+    static bool alternate = false;
+    if (alternate) {
+      for (int i = 0; i < PELOTON_RQ_SIZE; i++) {
+        auxSerial.write(peloton_rq_watts[i]);
+      }
+    } else {
+      for (int i = 0; i < PELOTON_RQ_SIZE; i++) {
+        auxSerial.write(peloton_rq_cad[i]);
+      }
+    }
+    alternate = !alternate;
+    txCheck   = 0;
+  } else if (PELOTON_TX) {
+    txCheck++;
+  }
+}
diff --git a/src/SensorCollector.cpp b/src/SensorCollector.cpp
new file mode 100644
index 00000000..5861e248
--- /dev/null
+++ b/src/SensorCollector.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2020  Anthony Doud & Joel Baranick
+ * All rights reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ */
+
+#include "Main.h"
+#include "SS2KLog.h"
+
+#include <sensors/SensorData.h>
+#include <sensors/SensorDataFactory.h>
+
+SensorDataFactory sensorDataFactory;
+
+void collectAndSet(NimBLEUUID charUUID, NimBLEUUID serviceUUID, NimBLEAddress address, uint8_t *pData, size_t length) {
+  const int kLogBufMaxLength = 250;
+  char logBuf[kLogBufMaxLength];
+  SS2K_LOGD(BLE_COMMON_LOG_TAG, "Data length: %d", length);
+  int logBufLength = ss2k_log_hex_to_buffer(pData, length, logBuf, 0, kLogBufMaxLength);
+
+  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, "<- %.8s | %.8s", serviceUUID.toString().c_str(),
+                           charUUID.toString().c_str());
+
+  std::shared_ptr<SensorData> sensorData = sensorDataFactory.getSensorData(charUUID, (uint64_t)address, pData, length);
+
+  logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " | %s[", sensorData->getId().c_str());
+  if (sensorData->hasHeartRate() && !rtConfig.getSimulateHr()) {
+    int heartRate = sensorData->getHeartRate();
+    rtConfig.setSimulatedHr(heartRate);
+    spinBLEClient.connectedHR |= true;
+    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " HR(%d)", heartRate % 1000);
+  }
+  if (sensorData->hasCadence() && !rtConfig.getSimulateCad()) {
+    float cadence = sensorData->getCadence();
+    rtConfig.setSimulatedCad(cadence);
+    spinBLEClient.connectedCD |= true;
+    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " CD(%.2f)", fmodf(cadence, 1000.0));
+  }
+  if (sensorData->hasPower() && !rtConfig.getSimulateWatts()) {
+    int power = sensorData->getPower() * userConfig.getPowerCorrectionFactor();
+    rtConfig.setSimulatedWatts(power);
+    spinBLEClient.connectedPM |= true;
+    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " PW(%d)", power % 10000);
+  }
+  if (sensorData->hasSpeed()) {
+    float speed = sensorData->getSpeed();
+    rtConfig.setSimulatedSpeed(speed);
+    logBufLength += snprintf(logBuf + logBufLength, kLogBufMaxLength - logBufLength, " SD(%.2f)", fmodf(speed, 1000.0));
+  }
+  strncat(logBuf + logBufLength, " ]", kLogBufMaxLength - logBufLength);
+  SS2K_LOG(BLE_COMMON_LOG_TAG, "%s", logBuf);
+  SEND_TO_TELEGRAM(String(logBuf));
+}
\ No newline at end of file
