Some work towards getting a more complete API.