Making it more async

Fix for earlier brain meltdown...