cleaned up cardsand dbfuncs, started on decks.
merge