 	DEBUG_PRINT("Checking I2C interface to cap touch sensor...");
 
 	
-	if( TouchManager.sensorOnline() ) {
+	if( touch.sensorOnline() ) {
 		DEBUG_PRINTLN("OK");
-		flash(GRN_DX,2);
+		flash(DX_1,2);
 	}
 	else {
 		DEBUG_PRINTLN("FAILED");
-		flash(RED_DX,2);
+		flash(DX_2,2);
 	}
 	
 	//	when we're done with setup advance the op state

	// 		ColorCoordinator.setBaselineColor(currentColor);
	// 	}
	// }
	#ifdef CHAIR_DEBUG
	switch( SerialDebugger.currentCommand() ) {
		case NO_CMD: {
			NOP;
			break;
		}
		case FORCE_DEMO: {
			break;
		}
		case FORCE_INACTIVE: {
			break;
		}
		case CSET: {
			for(uint16_t i = 0; i < NUM_LEDS; i++) {
				leds[i] = SerialDebugger.commandColor();
			}
			break;
		}
		case FTUNE: {
			DEBUG_PRINTLN("Kalimba Chair: Fine tuning mode");
			DEBUG_PRINT("FTUNE> ");
		}
		default: {
			DEBUG_PRINTLN("Unrecognized cmd");
			break;
		}
	}
	#endif

	// noInterrupts();
 //    FastLED.show();

}

void loop() {
	uint16_t n = touch.newTouches();
	Serial.print("New touches = "); Serial.println(n,HEX);
	// switch( OpStateManager.state() ) {
	// 	case OpStatePoweringUp: {
	// 		DEBUG_PRINTLN("Op state: powering up");
