Finish converting things to promises