Large update

Most of the deck building and card assignments done