WIP: ABI/API work