Deck refactor notes