Maybe a bit closer to async working