24557 - first pass using new admin api