Working blissfully against the current state of the API