Begin updates to the API and other internals

This does not compile…yet.