Deck tentatively completed

pending testing