Started implemented shuffling and cleaned up
Finished Shuffle function