Added shuffling, basic player logic