refactored async calls to be more like async calls. :-)