added Deck defs and other stuff