Start implenting the API version and add better error catching for it