WIP: more public api changes.
WIP: more public api changes.