added OCMotor, changed names to Servo…