Mweb 965

Do not merge
I think we can refactor this promise chain here.