Moved some code around, cleaned some things up, wrote an example
that demonstrates where I want the API to end up.