Updating server code. Should be near complete.