Bit of work on Servo