Commented on things we still need to fix and implemented second shuffle
algorithm