wip, removed async stuff