Got a lot working and tested within decks