Fill out the API a bit more. Start on tests.