More progress on server