now with even more async
Merge branch 'devel'