get rid of make callbacks in favor of promises