Neutron-star Science Lead Samar Safi-Harb has developed a program of research to prepare for the next generation of high-energy resolution and high-throughput X-ray astronomy, building on the legacy of Hitomi toward the future with XRISM, ATHENA and Colibrì.