Some progress on list_servers