Pre shuffle test

do not merge, just for review.