Shuffle some more. Add more cargo stuff