Started working on shuffle logic