Changed the scramble generator to use the same scramble for the moves and the state. Resolves #6