Updated to include part of class Deck