first small steps to make stack shallower to not await so much