This is not working, async is still messed up