diff --git a/hardware/digistump/avr/cores/pro/Arduino.h b/hardware/digistump/avr/cores/pro/Arduino.h
index 06e6fce..4afe5f6 100644
--- a/hardware/digistump/avr/cores/pro/Arduino.h
+++ b/hardware/digistump/avr/cores/pro/Arduino.h
@@ -103,6 +103,10 @@ int digitalRead(uint8_t);
 int analogRead(uint8_t);
 void analogReference(uint8_t mode);
 void analogWrite(uint8_t, int);
+void pwmWrite(uint8_t, int);
+void pwmConnect(uint8_t, int);
+void pwmDisconnect(uint8_t, int);
+void pwmReset(void);
 
 unsigned long millis(void);
 unsigned long micros(void);
diff --git a/hardware/digistump/avr/cores/pro/wiring_analog.c b/hardware/digistump/avr/cores/pro/wiring_analog.c
index 2d5577c..4ec232d 100644
--- a/hardware/digistump/avr/cores/pro/wiring_analog.c
+++ b/hardware/digistump/avr/cores/pro/wiring_analog.c
@@ -45,6 +45,8 @@ void analogReference(uint8_t mode)
   analog_reference = mode;
 }
 
+
+
 int analogRead(uint8_t pin)
 {
   #if defined( NUM_DIGITAL_PINS )
@@ -83,6 +85,80 @@ int analogRead(uint8_t pin)
   return LOW;
   #endif
 }
+
+void pwmReset()
+{
+  cbi(TCCR1D, OC1AV);
+  cbi(TCCR1D, OC1AU);
+  cbi(TCCR1D, OC1AW);
+  cbi(TCCR1D, OC1AX);
+  cbi(TCCR1D, OC1BV);
+  cbi(TCCR1D, OC1BU);
+  cbi(TCCR1D, OC1BW);
+  cbi(TCCR1D, OC1BX);
+}
+void pwmWrite(uint8_t channel, int val)
+{
+  if( channel == TIMER1A){
+    // connect pwm to pin on timer 1, channel A
+    sbi(TCCR1A, COM1A1);
+    sbi(TCCR1A, WGM10);
+    cbi(TCCR1A, COM1A0);
+    sbi(TCCR1B, WGM10);
+    sbi(TCCR1B, CS11);
+    //sbi(TCCR1B, CS10);
+    OCR1A = val; // set pwm duty
+  } else if( channel == TIMER1B){
+    // connect pwm to pin on timer 1, channel B
+    sbi(TCCR1A, COM1B1);
+    sbi(TCCR1A, WGM10);
+    cbi(TCCR1A, COM1B0);
+    sbi(TCCR1B, WGM10);
+    sbi(TCCR1B, CS11);
+    //sbi(TCCR1B, CS10);
+    OCR1B = val; // set pwm duty
+  } 
+}
+
+void pwmConnect(uint8_t pin)
+{
+  pinMode(pin,OUTPUT);
+  if(pin == 2)
+    sbi(TCCR1D, OC1AV);
+  else if(pin == 0)
+    sbi(TCCR1D, OC1AU);
+  //  cbi(TCCR1D, OC1AW);//used by crystal
+  else if(pin == 3)
+    sbi(TCCR1D, OC1AX);
+  else if(pin == 4)
+    sbi(TCCR1D, OC1BV);
+  else if(pin == 1)
+    sbi(TCCR1D, OC1BU);
+  //  cbi(TCCR1D, OC1BW);//used by crystal
+  //  sbi(TCCR1D, OC1BX);//reset pin
+
+}
+void pwmDisconnect(uint8_t pin)
+{
+  pinMode(pin,OUTPUT);
+  if(pin == 2)
+    cbi(TCCR1D, OC1AV);
+  else if(pin == 0)
+    cbi(TCCR1D, OC1AU);
+  //  cbi(TCCR1D, OC1AW);//used by crystal
+  else if(pin == 3)
+    cbi(TCCR1D, OC1AX);
+  else if(pin == 4)
+    cbi(TCCR1D, OC1BV);
+  else if(pin == 1)
+    cbi(TCCR1D, OC1BU);
+  //  cbi(TCCR1D, OC1BW);//used by crystal
+  //  cbi(TCCR1D, OC1BX);//reset pin
+
+}
+
+
+
 // Right now, PWM output only works on the pins with
 // hardware support.  These are defined in the appropriate
 // pins_*.c file.  For the rest of the pins, we default
@@ -129,10 +205,19 @@ void analogWrite(uint8_t pin, int val)
 		//sbi(TCCR1B, CS10);
 
 		cbi(TCCR1D, OC1AV);
-		sbi(TCCR1D, OC1AU);
+		cbi(TCCR1D, OC1AU);
 		cbi(TCCR1D, OC1AW);
 		cbi(TCCR1D, OC1AX);
 
+    if(pin == 2)
+      sbi(TCCR1D, OC1AV);
+    else if(pin == 0)
+      sbi(TCCR1D, OC1AU);
+    else if(pin == 3)
+      sbi(TCCR1D, OC1AX);
+
+
+
 		OCR1A = val; // set pwm duty
 	} else
 
@@ -150,16 +235,17 @@ void analogWrite(uint8_t pin, int val)
     //sbi(TCCR1B, CS10);
 
 		cbi(TCCR1D, OC1BV);
-		sbi(TCCR1D, OC1BU);
+		cbi(TCCR1D, OC1BU);
 		cbi(TCCR1D, OC1BW);
 		cbi(TCCR1D, OC1BX);
+    
+    if(pin == 4)
+      sbi(TCCR1D, OC1BV);
+    else if(pin == 1)
+      sbi(TCCR1D, OC1BU);
 
 		OCR1B = val; // set pwm duty
 	} else
-
-
-
-	
     {
       if (val < 128)
       {
diff --git a/hardware/digistump/avr/variants/pro/pins_arduino.h b/hardware/digistump/avr/variants/pro/pins_arduino.h
index b46ca1b..b1d7e1c 100644
--- a/hardware/digistump/avr/variants/pro/pins_arduino.h
+++ b/hardware/digistump/avr/variants/pro/pins_arduino.h
@@ -42,6 +42,10 @@
 #define MISO 8
 #define SCK  11
 
+
+static const uint8_t CHANNELA = TIMER1A;
+static const uint8_t CHANNELB = TIMER1B;
+
 static const uint8_t SDA = 0;
 static const uint8_t SCL = 2;
 
@@ -203,9 +207,9 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] =
 {
 	TIMER1A, 
 	TIMER1B,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
+	TIMER1A,
+	TIMER1A,
+	TIMER1B,
 	NOT_ON_TIMER,
 	NOT_ON_TIMER,
 	NOT_ON_TIMER,
diff --git a/hardware/digistump/avr/variants/pro32buffer/pins_arduino.h b/hardware/digistump/avr/variants/pro32buffer/pins_arduino.h
index e66bea0..3d4392d 100644
--- a/hardware/digistump/avr/variants/pro32buffer/pins_arduino.h
+++ b/hardware/digistump/avr/variants/pro32buffer/pins_arduino.h
@@ -42,6 +42,9 @@
 #define MISO 8
 #define SCK  11
 
+static const uint8_t CHANNELA = TIMER1A;
+static const uint8_t CHANNELB = TIMER1B;
+
 static const uint8_t SDA = 0;
 static const uint8_t SCL = 2;
 
@@ -203,9 +206,9 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] =
 {
 	TIMER1A, 
 	TIMER1B,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
+	TIMER1A,
+	TIMER1A,
+	TIMER1B,
 	NOT_ON_TIMER,
 	NOT_ON_TIMER,
 	NOT_ON_TIMER,
diff --git a/hardware/digistump/avr/variants/pro64buffer/pins_arduino.h b/hardware/digistump/avr/variants/pro64buffer/pins_arduino.h
index f61bc3c..5fb6732 100644
--- a/hardware/digistump/avr/variants/pro64buffer/pins_arduino.h
+++ b/hardware/digistump/avr/variants/pro64buffer/pins_arduino.h
@@ -42,6 +42,9 @@
 #define MISO 8
 #define SCK  11
 
+static const uint8_t CHANNELA = TIMER1A;
+static const uint8_t CHANNELB = TIMER1B;
+
 static const uint8_t SDA = 0;
 static const uint8_t SCL = 2;
 
@@ -203,9 +206,9 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] =
 {
 	TIMER1A, 
 	TIMER1B,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
-	NOT_ON_TIMER,
+	TIMER1A,
+	TIMER1A,
+	TIMER1B,
 	NOT_ON_TIMER,
 	NOT_ON_TIMER,
 	NOT_ON_TIMER,