Complete server a bit