added Deck class, redid some other classes