Implementing suggestions further from discussion

[#80392902]

If we feel good about this, this will be the final state of the core API functionality.