Adding shuffler and stuff