Servo Code Completion

Code reformatted and working, ready to be moved into tasks.