promises :)
more fixes
change key
Merge pull request #1 from shirlenec/Joelle

Joelle