Shuffling and a few class additions.