Writing the API, changing some call-home functions