Changes to the API

I know you're planning on a name change etc. and maybe rethinking a few things, but I thought I'd send this over as a pull request anyway.

:smiley_cat: