looking to clarify the uapi/ refactoring, and some oddities