Does this belong here? Seems like it should be in API