Messing with shims and promises