More API conversion, beginnings of authorization