WIP: Shape out API
Failing tests telling me what to do next!