API design in progress.