Start covering the API too