code cleanup, seperate files for api calls, alerts for failed calls
resolved conflicts