committed

Latest commit from server code, 9/18