Adding promises in all places currently not using them

Untested cause it's not working locally but I put in some promises because.. well, i could