Started doing it, but then it gets a little finicky with the promises, but think we should do it anyway