Create association current_deck, refactor