Server bits

Merge in the initial server bits changes