A fairly final copy, still no cards
merged