Finished the API - youppi!