Finishing up API conversion, all models / methods finished. Bugs remaining