Last pass on server code
Start index, apply gofmt
Haven't looked at this in a while...