Add NAMEFMT support
Debugging. Ongoing