Revert revert
ASYNC CODE I DEFEAT YOU
Working, but trying to commit
Merge branch 'master' into gh-pages