refactor the API for

@sethladd, shorten the API up a little bit more, as ~per #26.