[wip] Stash refactor