Move promises to separate branch