Did a lot of work on the API. :)