Starting on more API nonsense.