Shuffling added!
-documentation (in report) will be done by tomorrow