Mid-Competition Commit

Lots of frantic debugging of Servos here.