Finished raw API methods, pending refactor