Closing this as all endpoints are implemented