Added first implementation of repeat and shuffle