progress on server reconciliation