More progress on server logic