fixed async logic; possibly first working commit