Doc update (and API drafted)