all decks now work.  tons of stuff refactored.