Draft reworking of API.