Taking this opportunity to clean up the API quite a bit
Taking this opportunity to clean up the API quite a bit