Adding Shaffling Class