Little work on new API.