More API updates, getting close to a final API.