more progress on server