Conflict merge
actually fixed now
reworked logic to be more async