Add async updates (and massive amount of linting)
Merge remote-tracking branch 'origin/master'