diff --git a/640test.py b/640motortest.py
similarity index 93%
rename from 640test.py
rename to 640motortest.py
index 02f9737..4b67435 100644
--- a/640test.py
+++ b/640motortest.py
@@ -10,6 +10,11 @@ m5 = dw.getMotor(5)
 m6 = dw.getMotor(6)
 
 m1.setMotorSpeed(0)
+m2.setMotorSpeed(0)
+m3.setMotorSpeed(0)
+m4.setMotorSpeed(0)
+m5.setMotorSpeed(0)
+m6.setMotorSpeed(0)
 time.sleep(1)
 
 ##time.sleep(10)
diff --git a/640servotest.py b/640servotest.py
new file mode 100644
index 0000000..b3ff3de
--- /dev/null
+++ b/640servotest.py
@@ -0,0 +1,36 @@
+import time
+from darkwater_640.darkwater_640 import dw_Controller, dw_Servo, dw_Motor
+
+dw = dw_Controller( addr=0x60 )
+s1 = dw.getServo(1)
+s2 = dw.getServo(2)
+
+s1.off()
+s2.off()
+time.sleep(1)
+
+##time.sleep(10)
+print "Set forward - "
+print "Servo 1"
+s1.setPWMmS(2000)
+time.sleep(1)
+print "Servo 2"
+s2.setPWMmS(2000)
+time.sleep(1)
+print "Set neutral - "
+print "Servo 1"
+s1.setPWMmS(1500)
+time.sleep(1)
+print "Servo 2"
+s2.setPWMmS(1500)
+time.sleep(1)
+print "Set reverse - "
+print "Servo 1"
+s1.setPWMmS(1000)
+time.sleep(1)
+print "Servo 2"
+s2.setPWMmS(1000)
+time.sleep(1)
+print "All off"
+s1.off()
+s2.off()
diff --git a/darkwater_640/darkwater_640.py b/darkwater_640/darkwater_640.py
index b4ce144..4fdc61b 100644
--- a/darkwater_640/darkwater_640.py
+++ b/darkwater_640/darkwater_640.py
@@ -248,9 +248,9 @@ class dw_Servo:
 
 
                 if (num == 0):
-                        self.pin = 9
+                        self.pin = 0
                 elif (num == 1):
-                         self.pin = 8
+                         self.pin = 1
                 else:
                         raise NameError('Port must be between 0 and 1 inclusive')